changed submit input to rails-y input
updated styling
fixed submits
fix merge conflicts