Yeah this is long time pending, 
May be we can create an new issue to work on it and track it, by moving the navigation to CRUD functions.

I feel navigation needs to move to CRUD functions. would shorten up a lot of code.