diff --git a/rsconcept/backend/apps/rsform/views.py b/rsconcept/backend/apps/rsform/views.py
index 3966e556..d11632d5 100644
--- a/rsconcept/backend/apps/rsform/views.py
+++ b/rsconcept/backend/apps/rsform/views.py
@@ -234,21 +234,20 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
     @action(detail=True, methods=['post'])
     def check(self, request, pk):
         ''' Endpoint: Check RSLang expression against schema context. '''
-        schema =  s.PyConceptAdapter(self._get_schema())
         serializer = s.ExpressionSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         expression = serializer.validated_data['expression']
+        schema =  s.PyConceptAdapter(self._get_schema())
         result = pyconcept.check_expression(json.dumps(schema.data), expression)
         return Response(json.loads(result))
 
     @action(detail=True, methods=['post'])
     def resolve(self, request, pk):
         ''' Endpoint: Resolve refenrces in text against schema terms context. '''
-        schema = self._get_schema()
         serializer = s.TextSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         text = serializer.validated_data['text']
-        resolver = schema.resolver()
+        resolver = self._get_schema().resolver()
         resolver.resolve(text)
         return Response(status=200, data=s.ResolverSerializer(resolver).data)
 
diff --git a/rsconcept/frontend/src/components/Footer.tsx b/rsconcept/frontend/src/components/Footer.tsx
index feffc5e2..d18755d1 100644
--- a/rsconcept/frontend/src/components/Footer.tsx
+++ b/rsconcept/frontend/src/components/Footer.tsx
@@ -4,7 +4,7 @@ import { urls } from '../utils/constants';
 
 function Footer() {
   return (
-    <footer className='z-50 px-4 pt-2 pb-4 text-sm select-none whitespace-nowrap clr-footer'>
+    <footer className='z-50 px-4 py-2 text-sm select-none whitespace-nowrap clr-footer'>
       <div className='flex items-stretch justify-center w-full gap-4 mx-auto'>
         <div className='underline'>
           <Link to='/library' tabIndex={-1}>Библиотека</Link> <br/>
diff --git a/rsconcept/frontend/src/context/ThemeContext.tsx b/rsconcept/frontend/src/context/ThemeContext.tsx
index 4947a99f..2e3a1655 100644
--- a/rsconcept/frontend/src/context/ThemeContext.tsx
+++ b/rsconcept/frontend/src/context/ThemeContext.tsx
@@ -58,14 +58,14 @@ export const ThemeState = ({ children }: ThemeStateProps) => {
   const mainHeight = useMemo(
   () => {
     return !noNavigation ? 
-      'calc(100vh - 8rem)'
+      'calc(100vh - 7rem - 2px)'
     : '100vh'; 
   }, [noNavigation]);
 
   const viewportHeight = useMemo(
   () => {
     return !noNavigation ? 
-      'calc(100vh - 3.9rem)'
+      'calc(100vh - 3rem - 2px)'
     : '100vh'; 
   }, [noNavigation]);
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
index dd6314c0..2a8539af 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
@@ -338,8 +338,8 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
   const canvasHeight = useMemo(
   () => {
     return !noNavigation ? 
-      'calc(100vh - 10.1rem)'
-    : 'calc(100vh - 2.1rem)';
+      'calc(100vh - 9.8rem - 4px)'
+    : 'calc(100vh - 3rem - 4px)';
   }, [noNavigation]);
 
   const dismissedStyle = useCallback(
@@ -460,7 +460,7 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
         </div>
       </div>
     </div>
-    <div className='w-full h-full overflow-auto'>
+    <div className='w-full h-full overflow-auto border'>
     <div 
       className='relative'
       style={{width: canvasWidth, height: canvasHeight, borderBottomWidth: noNavigation ? '1px': ''}}