Temporary fix for clipping
Clarify messages and placement