severe changes to different screens to support buttons