cosmetic changes ti UI
searching working with new components in UI
Merge branch 'working'