More work on the whole screen UI