It's still not perfect, but should be usable. Many thanks for the feedback :))