Clean a little of code, Moved some UI