Merge pull request #17 from ollieflumeland/master

Pull From Master
Merge pull request #18 from ollieflumeland/master

Pull From Master
Rearrange Menu Items and show current field settings when modifying records
Merge pull request #7 from jonathanworth/master

Jonathan rearrange Menu Items and show current field settings when modifying r…