Improving Toast overlay, improving quality
Merge with master