move restoreBookmarkFolder to store; clean up formatting