moved some layout initialization from blocks to layout xml.
some code tidying