Expand Search to some Corporation Elements

Also implement a minor layout change