removed currentjob buttons and updated job and appliance classes
merge