Cleaned up some bad styles causing an unexpected result
Merge branch 'maker-camp'