Added drawables and Changed some names around