Update application navigation
Finalize listing fixes