Renamed button subs and added comments