some ui improvements
merged