Minor formatting updates, custom post types & custom taxonomies