Fin - 78 - Solve ui issue on production server