fix layout
change smpt settings
Merge branch 'step3'