Change layout. Add check box

fning
Merge branch 'feature/Iteration-4-dev-email' into Iteration-4-dev