Tweak locations to keep column layout
Remove unnecessary text