Added more components to the main screen