Fixing up UI a bit.