Fixing more errors in draft

Still left:
- Positioning is totally wrong
- Star stroke is not closed