@aumi23 Here you go. Overall the project is great. I like it and it works fine. I don't say this is better, just some minor tweaks you might consider.
made by request by @aumi23