Cleanup and a fix for owerflow of text in issues