split out format and bag views
lots of little formatting changes