Added switches and linear layouts to device form.