converted more existing screens to angular