restyled buttons, moved stuff to tfutils
fixed unit tests
merged with jason code