Added some consistency to the order of attributes in the html