Restructure and add customer page