finally working on current version so my commits work
enabled my location button in map screen and rearranged some buttons