Fixed helpers

Button and textfield helpers fixed