I did some changes based on your observations. I hope you like it