Layout fixes and removed warning surpressors

Signed-off-by: lg188 <lander.ghekiere@gmail.com>