Updated Dialog box and menu box from AOSP