make me modular
change layout a bit