Fix bugs and update left navigation code/