moved map, fixed devise stuff