Changed to using a composite view and markdown to make everything a little more over-engineered