Cell displaying/layout modifications. No where near complete though