WIP extended sidebar, various fixes and additions