More styling and improved searching parameters