some fixes and clou navigation