fixed merge and found better names for things. also, began thinking/coding of undo/redo feature
added more icon optionas