Changed ECB layout and sources