web-kit design and improved code