Refactor bottom navbar