Refactor for UNavbarWidget