Gpii 803

http://issues.gpii.net/browse/GPII-803
Are all these uses of `!important` required?