Comment by vicjicama

I did a couple fixes based on your comments, please let me know you feedback, thank you!