That is, actually, very simple fix for those issues and for whatever reason (maybe rushing to the deadline) it didn't come up in my mind!Thank you for you feedback! It's very useful!
