work on edit icons and other display issues. closes #348 #346 #345 #341 #340