Parse search to work, few UI Tweaks