Interface improvements [dev]