Fixes more alignment and overflow issuesl