Styling modal
Merge origin/master