Fix cloud related issues

Also updates service tree parent item styles