Final version add double click of return on navigation bar