Removed departments
Changed layout of admin categories, added fields for payment form
Cleaning up specs