Implement new layout/texting. Issue #9