Fixes for grid views