Style tweaks
Merged from repo, added some front end work