Add background indicator for navigation sidebar
Remove TODOs