Beginnings of class model and better UI
Minor color scheme change