Everything fixed except one sidebar bug