Creation page fixes