Adding highlights and server usage
Fixing buttons and server usage.