Search works + GUI rearrangement