Generally UI improvment
0.4.33