added missing css declarations, removed deprecated style.
Merge remote-tracking branch 'origin/master'