layout updates
add more layouts

still experimental, not very pretty
move layouts into separate package