BISERVER-8486 - working towards a style that matches the mockups

BISERVER-8486 - working towards a style that matches the mockups