Polished some stuff, added search fields.