Updated some changes with buttons