Bugfix and tabbed interface