Added views and buttons for primary screens