fixed layout and map functionality