Bugfix and spinner added