Updated layout to support new buttons and progressBar