android: fixing some drawing issues