Refactor, and improve text placement