ui enhancements and some quick fixes on the assets management