Formatted inputs, added checkbox