added some ui cleanups