Simplified Endpoint integration
Refactoring display for GUI