fixing issues on the live web-site