Some cleanup, structure and a nice background color

Signed-off-by: Alexander Kluth <kluth@freshcells.de>