and let's fix the input buttons as well