styles changed
added padding
Merge branch 'origin/master'