cleanup
layout and small fixes
wip
medium tests
cleanup