UI improvement and bugfix.