Fixing toolbar logic and removing datasource argument from bundle creation