Merged in changes by mario.
additional css changes