refactor assets, gave up on that annoying yellow box