Fixes Nota #2 - Drawer Layout Simplification