Finished Decoupling

Decoupled all of the data objects from the UI and added category
changing to the right click menu.