Cleaned code; more nav fixes; put nav inside page-container