minor changes and ui improvements.