custom ui improvements