Updated server to be more compliant with new UI.