Fixed typos after merging code from ibaton (widget and contstants for preferences)