UI tweaks + android gradle  plugin 1rc4