Drawer added. Some code refactoring