[WEB-145] Fixed comment issue
[WEB-146] Fix for javascript issue
[WEB-148] Beginning overlays