Sorted properties and added captions to input fields