bugs fixed + Nav