added in navigation bar; refactoring; styling changes