Add drawer + Some refactoring