Updated according to front-end updated
small fix with color