ui templates reorganization