Cleaned up nav and some layout stuff