clean up format
fix ui problem
fix?
merge in master