Fixing a button's text
Fixing some issues with auto complete