Integration Tests and UI Improvement