Added basic layout and navigation