Fixes
Working on options page