added search; adjusted layout