re #749 - Fixed issue when layout doesn't have a sidebar
Fixed typo
re #751 - Fixed event tracking code
re #751 - Fixed event tracking code