Layout QA Fixes
Merge branch '1.1.8' of github.com:abantecart/abantecart-src into 1.1.8