Design tweaks

Signed-off-by: diogorosa <diogo.m.c.rosa@gmail.com>