Dev/federico pomponii/improve layouts