Moved some UI stuff around