Refactor Html, add ng-hide logic
Further Nav Improvements, some refactoring