Cleaned up code some, updated sidebar in ListViewController.