Fix buttons 2