Options Page Update

Updated Options Page and integrated new options.
Fixed Previous Commit

Previous commit was not complete.
Merge pull request #1 from nueue/semars-branch

Options Page Updates Merge - Semar