Upgraded to assets and layout 0.2.11