ui second pass
merge conflicts fixed