Add cleaner, updated nav to bare default layout