Redesign sidebar. Fixed #6