Fix indentation issue and form labels