Small bug fixes. Integrated UI and backend