MenuDrawerItem cleanup
More drawer optimization