ui improvement; server integration
ui improvement; server integration