UI modified, server corrected