few changes to make ui work