Edited some UI problems that I didn't like