Restructuring of grid - should be more flexible and intuitive now