reflected on 6.1
tested, refactored drawer code