More enhancements. Navigation to final screen still has issues. Will fix tomorrow :)