Move Drawer options to it's own section