Cleand up UI a bit.