Fix for inconsistent UI In Drawer