Slightly better GridView
Add alert when product not found
Resolve merge conflict