:clipboard: :lightning: much UI and housecleaning