Rearrange search forms. adjust some padding and margin.