changed button color and form styles
settle merge conflicts