changing layout a bit
v2