Some clean-up

Add advanced device settings