Removed pmc-ui, small utility class adjusted and added