minor layout changes, fixed pesky circle bug, added undo