Fixed a few items; Nav still broken