More formatting changes and forms

yay