Change it back!
You cannot make your version better. It is a mess. The old version is much more superior than this new one. Listen to your customers and put it back the way it was. People do not need any more stress in their life and this is causing everyone stress.