trying to get the layout working on 2.3.... transparency fix included

Change-Id: I7ff420774754fcce4338b44c4dcdc50487f965ad
Ok, seems to work. Ugh.

Change-Id: I9f77eb76a8382622a01fde9459be1b56e8722d45