small UI improvement/bug fixes