Mainly layout changes

Signed-off-by: Frca <killerfrca@gmail.com>