More work on main screen