Merge pull request #42 from yenbryan/peterdev

modal clickable
template issue