refactoring
refactoring
refactoring and bugfix
created navbar classes