some changes on the template layout