Commit this
Merge branch 'Anna'
Some changes to pics an d style
cj