Improve grid view to make better use of screen space