Finished! Adding additional sorting and styling