diff --git a/frontend/components/Footer.tsx b/frontend/components/Footer.tsx
index a211d56..24e1d8f 100644
--- a/frontend/components/Footer.tsx
+++ b/frontend/components/Footer.tsx
@@ -6,17 +6,21 @@ import Link from 'next/link';
 const Footer: FC = () => (
     <footer className="footer flex items-center justify-center">
         <div className="container flex flex-wrap items-center justify-center">
-            <div className="flex w-full items-center xl:w-[33%]">
-                <img src="/images/ec-logo.png" alt="european commission logo" className="mr-3" />
-                <span>
-                    This Service is provided by KIT, co-funded by the{' '}
-                    <a href="https://ai4eosc.eu/" rel="noreferrer">
-                        AI4EOSC project
-                    </a>
-                    .
-                </span>
+            <div className="flex w-full content-center items-center justify-center md:w-1/3 xl:w-1/4">
+                <img
+                    src="/images/funded_by_eu.png"
+                    alt="european commission logo"
+                    className="my-4 mr-3"
+                />
             </div>
-            <div className="flex h-full w-full items-center xl:w-[33%]">
+            <div className="text-center md:w-1/2 xl:w-1/4">
+                This Service is provided by KIT, co-funded by the{' '}
+                <a href="https://ai4eosc.eu/" rel="noreferrer">
+                    AI4EOSC project
+                </a>
+                .
+            </div>
+            <div className="flex h-full w-full items-center md:w-1/3 xl:w-1/4">
                 <ul className={styles['legals']}>
                     <li>
                         <a href="https://www.scc.kit.edu/en/legals.php" title="Documentation">
@@ -31,7 +35,7 @@ const Footer: FC = () => (
                     </li>
                 </ul>
             </div>
-            <div className="flex w-full items-center justify-center xl:w-[33%]">
+            <div className="flex w-full items-center justify-center md:w-1/3 xl:w-1/4">
                 <a href="https://ai4eosc.eu/" rel="noreferrer">
                     <img
                         className="logo"
diff --git a/frontend/components/OrderingSelector.tsx b/frontend/components/OrderingSelector.tsx
index abfe829..e870822 100644
--- a/frontend/components/OrderingSelector.tsx
+++ b/frontend/components/OrderingSelector.tsx
@@ -1,10 +1,12 @@
 import { type ChangeEventHandler, type FC } from 'react';
 import Ordering from 'lib/Ordering';
+import clsx from 'clsx';
 
 type OrderingSelectorProps = {
     onChange: (ordering: Ordering | undefined) => void;
+    className?: string;
 };
-const OrderingSelector: FC<OrderingSelectorProps> = ({ onChange }) => {
+const OrderingSelector: FC<OrderingSelectorProps> = ({ onChange, className }) => {
     const _onChange: ChangeEventHandler<HTMLSelectElement> = (e) => {
         if (e.target.value.trim().length === 0) {
             onChange(undefined);
@@ -14,12 +16,12 @@ const OrderingSelector: FC<OrderingSelectorProps> = ({ onChange }) => {
     };
 
     return (
-        <div className="xs:w-full mb-2 flex flex-row items-center sm:w-auto">
-            <label htmlFor="ordering" className="mr-2 text-lg">
+        <div className={clsx('mb-2 flex w-full flex-row items-center sm:w-auto', className)}>
+            <label htmlFor="ordering" className="mr-2 min-w-[12ch] text-lg md:ms-auto md:min-w-fit">
                 Ordering:
             </label>
             <select
-                className="w-60 rounded-md disabled:opacity-50"
+                className="max-w-xs rounded-md disabled:opacity-50"
                 id="ordering"
                 onChange={_onChange}
             >
diff --git a/frontend/components/SelectedTags.tsx b/frontend/components/SelectedTags.tsx
index e59681b..db5bf65 100644
--- a/frontend/components/SelectedTags.tsx
+++ b/frontend/components/SelectedTags.tsx
@@ -8,7 +8,12 @@ type SelectedTagsProps = {
     onDelete: (tag: string) => void;
 };
 const SelectedTags: FC<SelectedTagsProps> = ({ className, tags, onDelete }) => (
-    <div className={clsx('xs:hidden mb-2 ml-2 flex flex-row flex-wrap gap-1 md:block', className)}>
+    <div
+        className={clsx(
+            'xs:hidden mb-2 ml-2 flex flex-row flex-wrap gap-1 empty:m-0 empty:gap-0 md:block',
+            className
+        )}
+    >
         {tags.map((tag) => (
             <SelectedTag key={tag} tag={tag} onDelete={(t) => onDelete(t)} />
         ))}
diff --git a/frontend/components/TagSelector.tsx b/frontend/components/TagSelector.tsx
index e724727..f75a4bf 100644
--- a/frontend/components/TagSelector.tsx
+++ b/frontend/components/TagSelector.tsx
@@ -1,20 +1,22 @@
 import { difference } from 'lodash';
 import { type FC } from 'react';
+import clsx from 'clsx';
 
 type TagSelectorProps = {
     allTags: string[];
     selectedTags: string[];
     addTag: (tag: string) => void;
+    className?: string;
 };
 
-const TagSelector: FC<TagSelectorProps> = ({ allTags, selectedTags, addTag }) => (
-    <div className="xs:w-full mb-2 flex flex-row items-center sm:w-auto">
-        <label htmlFor="tag-select" className="mr-2 text-lg">
+const TagSelector: FC<TagSelectorProps> = ({ allTags, selectedTags, addTag, className }) => (
+    <div className={clsx('mb-2 flex w-full flex-row items-center sm:w-auto', className)}>
+        <label htmlFor="tag-select" className="mr-2 min-w-[12ch] text-lg md:min-w-fit">
             Filter by tags:
         </label>
         <select
             onChange={(e) => addTag(e.currentTarget.value)}
-            className="w-60 rounded-md disabled:opacity-50"
+            className="max-w-xs rounded-md disabled:opacity-50"
             id="tag-select"
             disabled={allTags.length === selectedTags.length}
             value=""
diff --git a/frontend/components/templates/Template.tsx b/frontend/components/templates/Template.tsx
index 9187afe..7ba3a91 100644
--- a/frontend/components/templates/Template.tsx
+++ b/frontend/components/templates/Template.tsx
@@ -17,15 +17,15 @@ const Template: FC<TemplateProps> = ({ template }) => {
         <Link
             className={clsx(
                 styles['card'],
-                'text-black no-underline shadow transition-transform duration-75 hover:scale-105'
+                ' text-black no-underline shadow transition-transform duration-75 hover:scale-105'
             )}
             href={`/template/${template.id}`}
         >
-            <div className="flex flex-row">
+            <div className="flex flex-row flex-wrap">
                 <div className="grow">
-                    <div className="mb-2 flex items-center">
-                        <h2 className="mb-0">{template.title}</h2>{' '}
-                        {template.score && <Rating score={template.score} className="ml-2" />}
+                    <div className="mb-2 flex flex-wrap items-center justify-center">
+                        <h2 className="mb-0 mr-2">{template.title}</h2>{' '}
+                        {template.score && <Rating score={template.score} />}
                     </div>
                     <p className={styles['summary']}>{template.summary}</p>
                 </div>
diff --git a/frontend/pages/index.tsx b/frontend/pages/index.tsx
index d3d5827..62ac90e 100644
--- a/frontend/pages/index.tsx
+++ b/frontend/pages/index.tsx
@@ -60,21 +60,26 @@ const Templates: NextPage = () => {
     return (
         <Layout>
             <h1 className="h5">Templates Hub</h1>
-            <p style={{ color: '#878787' }}>Create Software Projects easily from the templates below.{' '}
-            You are also welcome to <a href="https://github.com/m-team-kit/templates-hub">contribute</a> with more templates</p><br />
+            <p style={{ color: '#878787' }}>
+                Create Software Projects easily from the templates below. You are also welcome to{' '}
+                <a href="https://github.com/m-team-kit/templates-hub">contribute</a> with more
+                templates
+            </p>
+            <br />
 
             {templates.isLoading && <LoadingSpinner />}
 
             {templates.data && (
                 <>
-                    <div className="flex flex-row flex-wrap">
+                    <div className="justify-between md:flex md:flex-row md:flex-wrap">
                         <TagSelector
                             allTags={allTags}
                             selectedTags={selectedTags}
                             addTag={select}
+                            className="flex-1"
                         />
-                        <SelectedTags tags={selectedTags} onDelete={unselect} className="grow" />
-                        <OrderingSelector onChange={setOrdering} />
+                        <SelectedTags tags={selectedTags} onDelete={unselect} className="flex-1" />
+                        <OrderingSelector onChange={setOrdering} className="flex-1" />
                     </div>
                     <div className="grid auto-rows-fr grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-3">
                         {templates.data.data.map((template) => (
diff --git a/frontend/public/images/EN_Co-fundedbytheEU_RGB_NEG.png b/frontend/public/images/EN_Co-fundedbytheEU_RGB_NEG.png
new file mode 100644
index 0000000..272a0bc
Binary files /dev/null and b/frontend/public/images/EN_Co-fundedbytheEU_RGB_NEG.png differ
diff --git a/frontend/public/images/ec-logo.png b/frontend/public/images/ec-logo.png
deleted file mode 100644
index 09cd279..0000000
Binary files a/frontend/public/images/ec-logo.png and /dev/null differ
diff --git a/frontend/public/images/funded_by_eu.png b/frontend/public/images/funded_by_eu.png
new file mode 100644
index 0000000..c2ab277
Binary files /dev/null and b/frontend/public/images/funded_by_eu.png differ