Tidyup plus variable clearing
Add navigation with reload and remove extra unneeded navigation