Clean up less files and tidy - add labels