Fixed lauout issue and save SeltaDevice