Progress implementing LayerDrawable, many refactorings