Extra spaces removed and aligned some elements