OptionScreen finished and other minor fixes