Improved widget navigation