ui improvements and some functionality fixes