align and fix text issues