Merge pull request #248 from Smashman/dev

Fix a typo and minor error in options
re-arrange execution order on profile pages