Laid some good groundwork for customizing the styling - fixed bug in last commit