Fix forms & buttons