final styesheet updates
Merge branch '6rpa1'