Fix assets related issue and modified design