Changed form structure, commented labels and added placeholders