Drawer interaction improvements (at least I think so)

@jstrecker yep ;)