Fixed double click navigation along with some other fixes