Updated labels
Updated demo page