BZ-10553 major changes, integration of new layout