Added CORS, few UI fixes
Fixed CORS