General cleanup

Added comment styles, cleaned up some CPT layouts