cleanup. UI improvements