Proper strings for checks. Fixed menu item/drawer bug. Cleanup in DatabaseImpl