diff --git a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs
index 892478694..a4ca5b6f2 100644
--- a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs
+++ b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/BaseUserViewModel.cs
@@ -15,7 +15,7 @@ public class BaseUserViewModel : BindableBase
         private static ObservableCollection<UserData> _allUsers;
 
         public IRepository<UserData> UserRepository     { get => _userRepositary; set => _userRepositary = value; }
-        public ObservableCollection<UserData> AllUsers  { get => _allUsers; private set => _allUsers = value; }
+        public ObservableCollection<UserData> AllUsers  { get => _allUsers;private set => _allUsers = value; }
         public List<Role> AllRoles                      { get; private set; } = new List<Role>();
         public List<string> AllGroups                          { get; private set; }
         public static event EventHandler OnNewUserAdded;
@@ -27,13 +27,17 @@ public BaseUserViewModel()
                 UserRepository  = SecurityManager.Manager.UserRepository;
             AllRoles            = SecurityManager.Manager.AvailableRoles.ToList();
             AllGroups           = SecurityManager.Manager.AvailableGroups().ToList();
-            AllUsers            = new ObservableCollection<UserData>(UserRepository.GetRecords());
+            AllUsers            = new ObservableCollection<UserData>(UserRepository.Queryable.Where(p=> true));
         }
 
+
+
+
+
         protected void UsersChanged()
         {
             AllUsers.Clear();
-            UserRepository.GetRecords().ToList().ForEach(AllUsers.Add);
+            UserRepository.Queryable.Where(p => true).ToList().ForEach(AllUsers.Add);
             OnNewUserAdded?.Invoke(this, EventArgs.Empty);
         }
     }
diff --git a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml
index ee9ef63ed..26d3b816e 100644
--- a/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml
+++ b/src/TcOpen.Inxton/src/Security.Wpf/UserManagement/GroupManagement/UserManagementGroupManagementView.xaml
@@ -32,11 +32,10 @@
         <controls:PermissionBox Permissions="Administrator">
             <TabControl>
                 <TabItem Header="{x:Static p:strings.CurrentUsers}">
-                    <ScrollViewer  VerticalScrollBarVisibility="Auto">
-                        <Grid Margin="12" Style="{DynamicResource Card}">
-                        <controls:AllUsersGroupManagementView/>
-                        </Grid>
-                    </ScrollViewer>
+                    <Grid Margin="12" Style="{DynamicResource Card}">
+                            <controls:AllUsersGroupManagementView/>
+                    </Grid>
+              
                 </TabItem>
                 <TabItem Header="{x:Static p:strings.NewUser}">
                     <ScrollViewer  VerticalScrollBarVisibility="Auto">
@@ -46,11 +45,11 @@
                     </ScrollViewer>
                 </TabItem>
                 <TabItem Header="Group management">
-                    <ScrollViewer  VerticalScrollBarVisibility="Auto">
+                 
                         <Grid Margin="12" Style="{DynamicResource Card}">
                             <controls:AllGroupsGroupManagementView />
                         </Grid>
-                    </ScrollViewer>
+                
                 </TabItem>
             </TabControl>
         </controls:PermissionBox>
diff --git a/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs b/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs
index ef4df8c12..3ba693afc 100644
--- a/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs
+++ b/src/TcOpen.Inxton/src/Security/RoleGroupManager.cs
@@ -230,7 +230,7 @@ public string GetRolesFromGroupString(string group)
         public List<GroupData> GetAllGroup()
         {
             List<GroupData> data = null;
-            data = groupRepo.GetRecords().ToList();
+            data = groupRepo.Queryable.Where(p => true).ToList();
             return data;
         }
     }
diff --git a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml
similarity index 96%
rename from src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml
rename to src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml
index 532bee9a7..2279ed03a 100644
--- a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml
+++ b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="TcoElements.TcoCarouselView"
+    x:Class="TcoElements.TcoCarouselSpotView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -44,7 +44,7 @@
                             Foreground="{DynamicResource OnWarning}"
                             HorizontalAlignment="Center"
                             MaxWidth="300"
-                            Visibility="{Binding _status.InPosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter}, ConverterParameter=false}"
+                            Visibility="{Binding _status.InPosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter}, ConverterParameter=true}"
                             Content="{x:Static p:Resources.CarouselNotInPos}"  />
                 <Button Style="{StaticResource MaterialDesignOutlinedButton}"
                             VerticalAlignment="Top"
@@ -53,7 +53,7 @@
                             Foreground="{StaticResource OnError}"
                             HorizontalAlignment="Center"
                             MaxWidth="300"
-                            Visibility="{Binding _status.InPrecisePosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter }, ConverterParameter=false}"
+                            Visibility="{Binding _status.InPrecisePosition.Cyclic, Converter={tcoCore:BooleanToVisibilityConverter }, ConverterParameter=true}"
                             Content="{x:Static p:Resources.CarouselNotInPrecisePos}"  />
 
             </StackPanel>
@@ -72,7 +72,7 @@
                             Foreground="{StaticResource OnError}"
                             MaxWidth="350"
                             Margin="5,200,5,5"
-                            Visibility="{Binding _status.TurnSafetyCondition.Cyclic, Converter={vortex:BooleanToVisibilityConverter}, ConverterParameter=false}"
+                            Visibility="{Binding _status.TurnSafetyCondition.Cyclic, Converter={vortex:BooleanToVisibilityConverter}, ConverterParameter=true}"
                             Content="{x:Static p:Resources.CarouselNotSafeTurnCondition}" >
                 </Button>
 
diff --git a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml.cs b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml.cs
similarity index 96%
rename from src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml.cs
rename to src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml.cs
index 8dc287a89..7ec6d025a 100644
--- a/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselView.xaml.cs
+++ b/src/TcoElements/src/Wpf/TcoElements.Wpf/Carousel/TcoCarouselSpotView.xaml.cs
@@ -14,10 +14,10 @@ namespace TcoElements
     /// <summary>
     /// Interaction logic for TcoCarouselServiceView.xaml
     /// </summary>
-    public partial class TcoCarouselView
+    public partial class TcoCarouselSpotView
         : UserControl
     {
-        public TcoCarouselView()
+        public TcoCarouselSpotView()
         {
             if (DesignerProperties.GetIsInDesignMode(this))
             {
diff --git a/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj b/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj
index 1d4bdfa2c..8a75ffc2b 100644
--- a/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj
+++ b/src/TcoElements/src/Wpf/TcoElements.Wpf/TcOpen.Inxton.TcoElements.Wpf.csproj
@@ -51,7 +51,7 @@
     <Page Update="Carousel\Service\TcoCarouselServiceView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
-    <Page Update="Carousel\TcoCarouselView.xaml">
+    <Page Update="Carousel\TcoCarouselSpotView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>