refreshed UI, added state labels