Various Cleanups, Bugfixes and replaced Famelo.Scaff with Famelo.Navigation to render the whole thing.

Change-Id: I85adfb5f5c1bb73a746a613bcbdd2fb7289a195b