Move viewer and menu modules up and fix draw_shapes