Dev/federico pomponii/improve layout