some ui and functionality changes