Change UI  and fixed backend issues