Rearranged html forms so dice data populates the proper boxes
Fixed rollDice function so that all calculations work properly