Cleaning up, part 1
Added groud to orient the figure