Tweak the UI and add more server data