Streamlining form and adding labels for accessibility purposes