Changed the option tab name to options, cleanup