move sidebar amendments into core; fix cobrands
automatic whitespace fixes