Chasing down shit that needs to be rewired for the new sidebar layout
Wiring done, time to fix inconsistencies.