Drawer bug fixes; Notice style fixes;