Changes & Fixes

The map method has been changed to simplify them and now position the
map exactly where the user wants