Match view popup, input fields
Merge pull request #12 from OrangeeWeb/master

Match view popup, input fields