Update 6

Overall template 90% done. Views are still incomplete.