some padding for the form
updated the form and renamed some things to be more uniform, improved the control flow of setup, though it's not complete yet