Button abstraction violation fix
Input abstraction violation fix
Input usage simplification