Created tabs, now fix the save and restore bugs that caused it