cleaner drawables, layou changes

Change-Id: I980b22a3e7eb4ec10121bedda7845e74937de2cc