Fix wrong button names/places