forgot to add this yesterday - UI clean up - more to follow...