Sidebar hooks, minor rearrangements and streamlining, small style changes.