Fixed a few bugs and moved a few ui elements.