Redoing UI to be more efficient, lots of progress