Refactor
Fix assets