OptionScreen and refactor