merge fixedLayout changes from mapjs