Manage Device + Minor Fix on look