Better layout, several fixes

Signed-off-by: jmlucjav <jmlucjav@gmail.com>