Make Customer window neater