Update logic, add avatar & switch on/off function. UI adjustment.