Dev/davide barbieri/layout