Making some progress/ Resolved button issues