Fixed Whitespace and overflow