UI improvement. Added soke code.