Fixed layout bugs

Fixed Layout bugs
Relocated Search Box