Update topbar and fix subsidebar elements in organizer