Show boxes with right layout
Add padding in boxes
Merge branch 'develop'