Added new screens for the basic app