EndpointManager refactor and multiple feature & styling fixes