EndpointManager refactor and multiple feature & styling fixes
Merge pull request #7 from briangleeson/mergeBrian

EndpointManager refactor and multiple feature & styling fixes