Lots of style tweaks and cleanup in preperation for launch