Updated some stuff to make it look better :)