Edits to charges controller, added cancel subscription option
Modified cancan definiations
Edit to view formatting, refactored controllers