client logic fulfilled
some fixes
client UI fixed