Fixed device creation, minor visual updates