Added a utils and changed around some HTML