Move aoi control to top
Get spacing right