changes to layout
rearrange search