- gtk_box_pack_start (GTK_BOX (boxes), video_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), audio_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), text_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), vis_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), mute_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), download_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), buffer_checkbox, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), volume_label, TRUE, TRUE, 2);
- gtk_box_pack_start (GTK_BOX (boxes), volume_spinbutton, TRUE, TRUE, 2);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (vis_checkbox), FALSE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (audio_checkbox), TRUE);
+ gtk_grid_attach (GTK_GRID (boxes), video_checkbox, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), audio_checkbox, 1, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), text_checkbox, 2, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), vis_checkbox, 3, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), soft_volume_checkbox, 4, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), native_audio_checkbox, 5, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), native_video_checkbox, 0, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), download_checkbox, 1, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), buffering_checkbox, 2, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), deinterlace_checkbox, 3, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), soft_colorbalance_checkbox, 4, 1, 1, 1);
+
+ gtk_grid_attach (GTK_GRID (boxes), mute_checkbox, 7, 0, 2, 1);
+ gtk_grid_attach (GTK_GRID (boxes), volume_label, 6, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (boxes), volume_spinbutton, 7, 1, 1, 1);