revert some stuff; sidebar1 was broken