Some sidebar work. Fixed issue #13