added ui improvements