Changed navigation and device groups organization