Move private methods down, add data provider for creative toolbox