UI cleanup. Addresses #186.