Fixed the sequence of tabs.
Fix editor not restored on restart
Merge pull request #13 from bodiam/master

Two issues fixed