Some more refining with Bootstrap, add 'restore' logic and fix some bugs in creation