format html & close off .container
Merge fixes