some small ui improvements
merge development