UI clean up
Fixed some truncating issues