Fix buttons again