ec0257e fixed layout and stuff