Moved labels

- Labels should be aside or above form fields
- Inconsistency compared to other templates