Updated layout to use more padrino helpers