Refactor drawer menu