Changes in layout and tests