Added layout and navigation