#28 Fixed some sidebar issues