Options page work
Cleanup