Improve buttons and forms