- ui updates, lots of new code