fixed grid improvments