Reverting because of nav header issue, fix all issues before committing
Reverting because of hidden headers due to nav bar