Another Massive update to layout and Server List