:lipstick: UI enhancements and restructuring of client code