I8: Changed template layout