Started impl. more UI enhancements