Fixed some major bugs in OptionBar