changed map and text order