Added Flat UI & templates edit