Misc. UI cleanup & streamlining.