Added categories
Added linking for devices