Refactor navbar &  sidebar