Improve smart creation and fix navigation