Rearrange search forms. adjust some padding and margin.
Merge branch 'feature/#284-search' into develop