Slim down buttons, add forms