Issue 130 - finetune system ui