Clean up classes and make the Extra Setting Page Work