got rid of extra textbox, removed gradient
fix merge conflict