Fixes for buttons and forms