working a lot better now inside the app. Automated QA tests still not complete