additional ui improvements #2