New sitelayout - lots of small fixes