Fixes main screen bugs, per Cameron's doc