Integration tests working
Some UI changes