Moved controls around a bit more.