diff --git a/main.c b/main.c
index 4b32e03d596a4cd3c342a8f0c66487beb4b0f020..f5f174ff7ec8a92c7ceeaf1568e1ef104bf3b523 100644
--- a/main.c
+++ b/main.c
@@ -34,7 +34,7 @@
 
 #define WINDOW_WIDTH 800
 #define WINDOW_HEIGHT 800
-#define NB_CHARGES 5
+#define NB_CHARGES 6
 #define GRID_SPACING 15
 #define NB_POINTS                                                              \
     ((WINDOW_WIDTH / GRID_SPACING) * (WINDOW_WIDTH / GRID_SPACING))
@@ -47,10 +47,10 @@ vec2 default_charges_pos[MAXIMUM_CHARGES];
 double default_charges[MAXIMUM_CHARGES];
 charge_t *charges;
 
-bool toggle_lines_view = false;
-bool toggle_vector_view = true;
+bool toggle_lines_view = true;
+bool toggle_vector_view = false;
 bool toggle_heatmap_view = false;
-bool animate = true;
+bool animate = false;
 
 void update() { update_simulation(charges, charge_count); };
 
@@ -90,6 +90,9 @@ void display() {
     glClearColor(1, 1, 1, 1);
     glClear(GL_COLOR_BUFFER_BIT);
 
+    if (toggle_heatmap_view)
+        draw_heatmap(charges, charge_count, WINDOW_WIDTH, WINDOW_HEIGHT);
+
     if (toggle_lines_view) {
         for (int i = 0; i < NB_POINTS; i += 10) {
             glColor3f(0.2, 0.2, 0.2);
@@ -98,9 +101,6 @@ void display() {
         }
     }
 
-    if (toggle_heatmap_view)
-        draw_heatmap(charges, charge_count, WINDOW_WIDTH, WINDOW_HEIGHT);
-
     if (toggle_vector_view) {
         draw_vector_field(charges, charge_count, starting_points, NB_POINTS,
                           WINDOW_WIDTH, WINDOW_HEIGHT);
@@ -182,7 +182,8 @@ void keyboard(unsigned char key, int UNUSED(x), int UNUSED(y)) {
 int main(int argc, char **argv) {
     srand(time(NULL));
 
-    charges = malloc(sizeof(charge_t) * charge_count * 10); // Large list for further charges
+    charges = malloc(sizeof(charge_t) * charge_count *
+                     10); // Large list for further charges
 
     // Generate all default charges
     for (int i = 0; i < charge_count; i++) {