minor stuff
minor improvement
UI improvements