Added a layout tester and corrected text layout