Modified template layout