added icons, more cell stuff