Input boxes redone and formatted