improvements
caching, minor styling and improvements