Desing ui improvements