Last changes before Usability test 2

Some minor changes in the Spike tool