Updated Options Panel to 3.0 Beta

Also cleaned up functions.