General cleanup & sidebar fixes (part 1)