Changes

Complete change of the layout according to what was told at the meeting
with Amy. Features not brought back.