Continue working on main screen