change padding for front
merge with master