fixing layout for 2.3