Cleaning up code
More styling and adding search form