More edits to make it just an object class

Separating the UI.