Update forms to remove extra button, css issues.