Fixed a typo and added the edit button for handheld devices
Merge branch 'master' into trips