Fixes for initial display and some button logic