OK, so I have created new pull request.
I have fixed (I hope) the problem with formatting (tab at the beginning of some strings). I did not know that it is important, but you are right - it looks much better.
I have also made some small updates and now I test it in my device.