Latest PR from SPPD-113 reverted #128
Description
@iTweeno you need to re-fix all the stuff that you planned on fixing with that pr. Just go through all the stuff that you were supposed to fix and see if its broken on the live site or not.
If there's anything broken, open an issue for each problem that needs fixing.