Added controller & models & moved map to seperate page