UI change; code refactor