Fix sidebar (still have issues though)