Minor code clean up and some styling fix for Firefox (any OS)