Added navigation and updated some design details