Updates to get side bar selection to show up properly