rebalancing mostly working - some bugs + display

display locations options also added to menu
Merge pull request #18 from ollieflumeland/master

Pull From Master