remove layout option

remove layout option and include it in partials and replace double
quote by simple quote.