Did a lot of re-factoring to make entries more readable. Fixed the draft
and back button bug. Renamed classes for clarity.