Altered the two / routes into one map route.. less code (now with less bugs..)