Merge pull request #1 from rainum/new-design

New design
Merge pull request #2 from rainum/new-design

phone updated message
udpate todo fix