rotation fixed and more code added to drawables