Move Restore and Notes into their own tabs