Possible sidebar/navbar fixes incoming