UI improvement

Some UI improvement while changing views