#2 fix some small UI issues.