Proper button
Form corrections