Fixed Search box, minor layout changes