Updated Layout for main screen