Added Device properties and right click option