Also cleanup and have a beginning of good basis to build a real navigator.
Attach a file by drag & drop or click to upload
