Improved user interface for better navigation