interface look and logic improvement