Add layout level opacity and other small modifications