Added layout parsing extension
Added Layout Extension & Tests