Fix UI issues in Gingerbread devices