Modified several things to make it look much better