[17] more layout work

Signed-off-by: https://github.com/Infinity-420 <iceis2@hotmail.com>