Moved controls back into body