[20] more layout out work.... Alot to do still sigh

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