enhance search page layout (ref: #284)
Merge remote-tracking branch 'origin/dev' into dev