Tested refactor, it does preserve layout
Updating the TODO list
When loading a file, make sure the appropriate target is active
Preparing for 0.7.1.2