Fix observation mapper, small refactoring on spinner