Fixed major CSS flop that was created from merge conflicts