merge
premerge
 UI tweaks, bug fixes and location cleanup