Orderedthe form a little bit, added labels