Feature/css layout

wip
refactor a bit, layout a bit.