Task add fix. Some ui cleanup.