added search fields and fragmented out menu