normal style
Merge branch 'fix_search_box' into development