Updated with padding
Added so it search after key is pressed
Removed a button, changed name on the other.