fix button edit page
fix search page style
Merge origin/ardfo into ardfo

Conflicts:
	module/Search/view/search/search/index.phtml