Fixing the UI issue and the integration tests