Updates to Goals sidebar + Misc changes