mistake handler improved and grid view improoved as well