put location name on navbar in add machine screen
Merge branch 'enhancements'