assets fixes and optimizations