removed unused drawables, minor changes