Updated navigation and some layout stuff