layout redesign

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>