small UI clean up and code clean up