Finilize styling and testing