Fixes Sidebar issues when resizing + other cleanup