Moving EffectsPanel branch to master