[CORE-104] Fixed ui + updated extension type