Drawer layout improvement