Using Gumby framework for styles
Minor tweaks