Fix styling issues with firefox and redo some of the previous changes properly

Jira: CSC-2256
Signed-off-by: David Lu <dlu@turn.com>