Move options saving to options class
Clean up admin page
Shuffle functionality around and general cleanup
Merge from dev branch