Changing to the design pattern used by the rest of the app.

Nav works now.

However the design pattern is not how it should be in the least.