Drawer layout cleanup