Added iligment by width, some changes in design.