Customer page fixes, etc...