Removing unused commented html, reordering buttons