Update for better Android Look and Feel.