Adding ordered list functionality + fixing label creation