Fixed some issues, completed removing of optionView