reworked navigation bar logic in controllers