some ui improvements
some clean up