merged in more design and added search