cleaning up forms, making buttons out of links