Updated Search Layout
Fix a few warning issues