Much better navigation
Added todo
Fix bugs