Refactoring into new template
Added nav bar
Basic refactor into new template