Hello!
My name is Vladimir Obrizan, I'm a director of Design and Test Lab, a small mobile software development company with 3 years of experience, located at Kharkov, Ukraine.
I can do quick review for free. And it seems to me this will be a quick fix, indeed.
With best regards,
Vladimir Obrizan