some ui work on navbar
big refactoring of controllers, compile passed