modify x and y fields in Navigation
removed useless comments from Main