Added layout and navigation bar