Reorganize html for better consistency
Closes #163 - add page class suffix as a new class to main container