drawer now has icons
merge cleanup