Fix alignment and back to original ellipsize

Change-Id: If3e6597bdc2e351b9797e8b1edb7cac2a59a3fd1