Layout fixes for remotesearch