Fixed issue 1 - various CSS changes