Enhanced template layout