#83 Removed unused class
#83 Refactored body
#83 Refactoring navbar