Asset fix
UI tweaks