Next stuff
Fix issue with before_content/After_content
Change container-fluid to container
Add template tags
Merge