Added assets and improved code