map changes and buttons added