sidebar working again
merge fix