Improved routes navbar etc