fixes transitions and navigation