Lots of misc updates for styling and tweaking of functionality