grid view and bug fixes