UI improvement, cleanup