Cleaning up/re-tooling UI