Fixed parameters
Added Layout Bundle
Changed Template