Reintroduce some events for better navigation handeling