Drawer fixes + button intents