Moved navigation & other markup to partial file