Modify match pattern.
Fix style of 'add' button.
Merge branch 'develop'