Fixes to search + started to add new design