Success page fixes