add aspect ratio fix  and border
Merge remote-tracking branch 'origin/master'