Fixed bugs
Updated a few methods - navigation works now