Add correct content wrappers and sidebar markup to enable theme compatibility.
Use 1 column layout on Product Single page template
Fix merge conflicts in WC functions file. Tidied and organised file and commented.