Change Label-Ids for axes
Update Readme
Update read me
Update the default template to current structure