Cleanup fix for options page
Version 5.3