Moved controls into an aside