checking in first round of updates on base template and re-worked navigation bar