Major Consolidation of Code and Forms

Second UI overhaul and feature flesh out