fixed layout elements which were in the wrong order