Added assets and finalized layouts