Fixed a fucking stupid retard bug, oh and some ui tweaks