Added a bunch of minor changes to make the content more dynamically generated