Move the elements around in the grid

Change-Id: I7f55399105e671eace1a9366572899e4be4a8da9