fixed more UI issues.