css, js for modal added
Merge origin/master
layout icon changed, modal added