fixed rendering issues and some ui enhancements