Customer page bugs

**Ready to merge**