Moved map into span column