Another round of changes and some new graphics