some more assets refactoring
responsive WIP