New site layout

continuing #239