Making some changes 2of3 Buttons working but there is a little bug