Moved map into it's own cell