Some fixes
WIP OptionsMenu