Search mechanism added, as well as redesign and fixes