Revert "Customer Screen Work 5"

This reverts commit 012dc25368c7cb6dda12111a8551c00738bf58fc.