begin merge Minh
Merge remote-tracking branch 'origin/minh'
merged Minh
Fix layout