some ui and minor functionality changes