Impl. renaming feature and more UI enhancements