assets and layouts bug fixed