Added selected-page
Updated structure and layout