Cleanup and fixed the text location