Merged assets, improved visuals