Minor Change: Multiple interface improvments to generic applications.