Adding menu and further mapping functionality