css conflict fixed 11/07/14