UI widgets revison