Added shell for endpoints
Cleaned up pref display