fixed broken device support, rename some methods to better represent devices, fix tiny layout