Commit so I don't lose everything
A lot of UI work - it's still shaky but better