Added layout and navigation niceties