diff --git a/frontend/src/feature/cards/components/CardDetails.vue b/frontend/src/feature/cards/components/CardDetails.vue
index dcd9e61..41ac09f 100644
--- a/frontend/src/feature/cards/components/CardDetails.vue
+++ b/frontend/src/feature/cards/components/CardDetails.vue
@@ -10,7 +10,7 @@
 
     <v-card-text>
       <h4 class="pa-2 ma-2">{{ card.question }}</h4>
-      <v-container class="pa-2 mt-2">
+      <v-form @submit.prevent @keydown.enter="highlightCorrectAnswers" class="pa-2 mt-2">
         <v-text-field v-if="card.type === CardType.SIMPLEQA" v-model="providedAnswer"
                       density="compact" label="Your Answer"
                       :class="{'correct': answerShown && isCorrect(providedAnswer),
@@ -25,17 +25,15 @@
                                       'error': selected.includes(option) && answerShown && !isCorrect(option),
                                       'selected': !answerShown && selected.includes(option)}"/>
         </v-list>
-      </v-container>
+        <v-row class="mt-3 pa-3 d-flex justify-space-around">
+          <v-btn @click="highlightCorrectAnswers" :disabled="!selected && !providedAnswer"
+                 prepend-icon="mdi-check-circle" color="green" variant="outlined">
+            Check Answer
+          </v-btn>
+        </v-row>
+      </v-form>
     </v-card-text>
 
-    <v-container>
-      <v-row class="pa-3 d-flex justify-space-around">
-        <v-btn @click="highlightCorrectAnswers()" :disabled="!selected && !providedAnswer"
-               prepend-icon="mdi-check-circle" color="green" variant="outlined">
-          Check Answer
-        </v-btn>
-      </v-row>
-    </v-container>
 
     <v-card-actions class="pa-2 ma-0">
       <v-spacer/>
diff --git a/frontend/src/feature/cards/components/CardEdit.vue b/frontend/src/feature/cards/components/CardForm.vue
similarity index 88%
rename from frontend/src/feature/cards/components/CardEdit.vue
rename to frontend/src/feature/cards/components/CardForm.vue
index fb3fc21..c5e96f7 100644
--- a/frontend/src/feature/cards/components/CardEdit.vue
+++ b/frontend/src/feature/cards/components/CardForm.vue
@@ -1,6 +1,6 @@
 <template>
   <base-card-page>
-    <v-card-title class="text-center text-h4">Edit card of type {{ translateType(card.type) }}</v-card-title>
+    <v-card-title class="text-center text-h4">{{ mode }} card of type {{ translateType(card.type) }}</v-card-title>
     <v-card-subtitle class="text-center">Submit Changes with Enter or Save button</v-card-subtitle>
 
     <v-card-text>
@@ -26,7 +26,7 @@
 
     <v-card-actions class="pa-2 ma-0">
       <v-spacer/>
-      <save-mdi-button :disabled="!formValid" :click-handler="() => emit('update', newCard)"/>
+      <save-mdi-button :disabled="!formValid" :click-handler="emitAction"/>
       <cancel-mdi-button tooltip-text="Reset content"
                          :click-handler="resetNewCard"/>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -50,15 +50,21 @@ import BaseCardPage from "@/shared/pages/BaseCardPage.vue";
 
 const props = defineProps<({
   card: Card,
+  mode: 'Edit' | 'Add',
 })>();
 
 const emit = defineEmits<({
   'close': [val: boolean],
+  'post': [val: Card],
   'update': [val: Card],
 })>();
 
 const newCard = ref<Card>(clone(props.card));
 const formValid = ref(false);
 
+const emitAction = () => props.mode === 'Edit'
+  ? emit('update', newCard.value)
+  : emit('post', newCard.value);
+
 const resetNewCard = () => newCard.value = clone(props.card);
 </script>
diff --git a/frontend/src/feature/cards/components/RadioButtonCol.vue b/frontend/src/feature/cards/components/RadioButtonCol.vue
index ce1802d..ee52142 100644
--- a/frontend/src/feature/cards/components/RadioButtonCol.vue
+++ b/frontend/src/feature/cards/components/RadioButtonCol.vue
@@ -3,6 +3,7 @@
     <div class="d-flex flex-wrap justify-sm-space-between ma-n3">
       <v-radio-group v-for="index in Array.from({ length: groupSize }, (_, ind) => ind)" :key="index"
                      :model-value="model"
+                     :rules="[v => v != undefined || 'Choose!']"
                      @update:model-value="val => model = val!">
         <v-radio :value="index" class="ml-n4 mt-n2 mb-n2" label="correct" color="green"/>
       </v-radio-group>
diff --git a/frontend/src/feature/cards/model/card.ts b/frontend/src/feature/cards/model/card.ts
index 7df1aff..01fe699 100644
--- a/frontend/src/feature/cards/model/card.ts
+++ b/frontend/src/feature/cards/model/card.ts
@@ -42,33 +42,14 @@ export const clone = (card: Card) : Card => {
   };
 };
 
-export const generateNewCard = (cardType: CardType) : Card =>{
-  const card = {} as Card;
-
-  // shared fields of all types of card
-  card.tags = [];
-  card.title = '';
-  card.question = '';
-
-  switch (cardType) {
-    case CardType.SIMPLEQA:
-      card.type = CardType.SIMPLEQA;
-      card.answer = '';
-      break;
-    case CardType.MULTIPLE_CHOICE:
-      card.type = CardType.MULTIPLE_CHOICE;
-      card.correctOptions = [];
-      card.options = [''];
-      break;
-    case CardType.SINGLE_CHOICE:
-      card.type = CardType.SINGLE_CHOICE;
-      card.options = [''];
-      card.correctOption = 0;
-      break;
-    default:
-      break;
-  }
-  return card;
+export const emptyCard = (cardType: CardType) : Card =>{
+  return {
+    type: cardType,
+    question: '',
+    tags: [],
+    options: [],
+    correctOptions: [],
+  };
 };
 
 export const translateType = (type: CardType) : string => {
diff --git a/frontend/src/feature/cards/pages/CardsPage.vue b/frontend/src/feature/cards/pages/CardsPage.vue
index 1167fcd..fbd65e7 100644
--- a/frontend/src/feature/cards/pages/CardsPage.vue
+++ b/frontend/src/feature/cards/pages/CardsPage.vue
@@ -1,16 +1,18 @@
 <template>
-  <v-container :hidden="displayDetails || displayEdit">
+  <v-container :hidden="uiState.display !== 'cards'">
     <v-card class="pa-2 ma-2 mx-auto d-flex flex-column justify-space-between" color="secondary" fill-height>
       <v-card-title v-text="`Cards in ${categoryName}`" class="text-center text-h4"/>
-      <div class="d-flex flex-row justify-space-between gc-12">
-        <v-select
-          v-model="cardType"
-          label="Select type of new card"
-          :items="[CardType.SIMPLEQA, CardType.MULTIPLE_CHOICE, CardType.SINGLE_CHOICE]"
-        ></v-select>
-        <add-mdi-button tooltip-text="create card" :click-handler="addCard"/>
-      </div>
-
+      <v-row class="mr-0">
+        <v-col md="7"/>
+        <v-col cols="12" md="3">
+            <v-select v-if="uiState.selectActive" v-model="cardType" label="Select type of new card"
+                      :items="[CardType.SIMPLEQA, CardType.MULTIPLE_CHOICE, CardType.SINGLE_CHOICE]"/>
+        </v-col>
+        <v-col md="1"/>
+        <v-col cols="12" md="1" class="mb-4">
+          <add-mdi-button tooltip-text="Create new card" :click-handler="addButtonClicked"/>
+        </v-col>
+      </v-row>
 
       <v-form @submit.prevent="filter.set = filter.input">
         <v-text-field clearable @click:clear="filter.input=''" v-model="filter.input"
@@ -20,20 +22,21 @@
     </v-card>
   </v-container>
 
-  <card-details v-if="displayDetails" :card="card" @close="displayDetails = false" @edit="toggleEdit"
-                @delete="deleteCard"/>
-  <card-edit v-if="displayEdit" :card="card" @close="toggleEdit" @update="updateCard"/>
+  <card-details v-if="uiState.display === 'details'" :card="card"
+                @close="uiState.display = 'cards'" @edit="editForm" @delete="deleteCard"/>
+  <card-form v-if="uiState.display === 'form'" :mode="uiState.formMode" :card="card"
+             @close="closeForm" @update="updateCard" @post="addCard"/>
 </template>
 
 <script setup lang="ts">
 import {ref, shallowRef} from "vue";
-import {Card, CardType, generateNewCard} from "@/feature/cards/model/card.ts";
-import useCardsService from "@/feature/cards/composables/useCardsService.ts";
+import {useRoute} from "vue-router";
 import CardDetails from "@/feature/cards/components/CardDetails.vue";
 import CardItemScroller from "@/feature/cards/components/CardItemScroller.vue";
-import {useRoute} from "vue-router";
-import CardEdit from "@/feature/cards/components/CardEdit.vue";
 import AddMdiButton from "@/shared/buttons/AddMdiButton.vue";
+import CardForm from "@/feature/cards/components/CardForm.vue";
+import useCardsService from "@/feature/cards/composables/useCardsService.ts";
+import {Card, CardType, emptyCard} from "@/feature/cards/model/card.ts";
 
 const props = defineProps<({
   categoryId: string
@@ -41,53 +44,59 @@ const props = defineProps<({
 
 const categoryName = useRoute().query.name;
 const filter = ref({input: "", set: ""});
-const displayDetails = shallowRef(false);
-const displayEdit = shallowRef(false);
+const uiState = ref<{
+  display: 'cards' | 'form' | 'details', formMode: 'Edit' | 'Add', selectActive: boolean
+}>({
+  display: 'cards',
+  formMode: 'Edit',
+  selectActive: false
+});
 const toggleReload = shallowRef(false);
-const displayCreate = ref(false);
 const card = ref<Card>({} as Card);
-const cardType = ref<CardType>({} as CardType);
-
-cardType.value = CardType.SIMPLEQA;
+const cardType = ref<CardType>(CardType.SIMPLEQA);
 
 const openCard = async (id: string) => {
-  displayDetails.value = true;
+  uiState.value.display = 'details';
   card.value = await useCardsService().getCardById(id, props.categoryId);
 };
 
-const addCard = async () => {
-  card.value = generateNewCard(cardType.value);
-  displayCreate.value = true;
-  displayEdit.value = true;
+const addButtonClicked = () => {
+  // If no card type selection shown, show it, else open add form with empty card of selected type
+  if (uiState.value.selectActive) {
+    card.value = emptyCard(cardType.value);
+    uiState.value.formMode = 'Add';
+    uiState.value.display = 'form';
+  }
+  uiState.value.selectActive = !uiState.value.selectActive;
+};
+
+const addCard = async (newCard: Card) => {
+  await useCardsService().postNewCard(props.categoryId, newCard);
+  reloadAndShowCards();
 };
 
 const updateCard = async (newCard: Card) => {
   newCard.tags = newCard.tags.filter(tag => !!tag);
-  if (displayCreate.value) {
-    await useCardsService().postNewCard(props.categoryId, newCard);
-    card.value = {} as Card;
-  } else {
-    card.value = await useCardsService().putCard(props.categoryId, newCard);
-  }
-  toggleReload.value = !toggleReload.value;
-  toggleEdit();
+  card.value = await useCardsService().putCard(props.categoryId, newCard);
+  reloadAndShowCards();
 };
 
 const deleteCard = async (curCard: Card) => {
   await useCardsService().deleteCard(props.categoryId, curCard);
+  reloadAndShowCards();
+};
+
+const reloadAndShowCards = () => {
   toggleReload.value = !toggleReload.value;
-  displayEdit.value = false;
-  displayDetails.value = false;
+  uiState.value.display = 'cards';
 };
 
-const toggleEdit = () => {
-  if (!displayCreate.value) {
-    displayDetails.value = !displayDetails.value;
-    displayEdit.value = !displayEdit.value;
-  } else {
-    displayCreate.value = false;
-    displayEdit.value = false;
-  }
+const editForm = () => {
+  uiState.value.formMode = 'Edit';
+  uiState.value.display = 'form';
+};
 
+const closeForm = () => { // switch display to details for edit mode, cards for add mode
+  uiState.value.display = uiState.value.formMode === 'Edit' ? 'details' : 'cards';
 };
 </script>
diff --git a/frontend/src/feature/dataio/pages/DataExport.vue b/frontend/src/feature/dataio/pages/DataExport.vue
index 45129b6..96db951 100644
--- a/frontend/src/feature/dataio/pages/DataExport.vue
+++ b/frontend/src/feature/dataio/pages/DataExport.vue
@@ -12,19 +12,17 @@
     <v-card-item>
       <v-img src="@/assets/folder.jpg" aspect-ratio="2.25" class="mx-auto"/>
       <v-label class="float-right text-sm-subtitle-2 text-grey">Photo by&nbsp;<a
-        href="https://unsplash.com/@qwitka?utm_content=creditCopyText&utm_medium=referral&utm_source=unsplash">Maksym Kaharlytskyi</a>&nbsp;on&nbsp;<a
+        href="https://unsplash.com/@qwitka?utm_content=creditCopyText&utm_medium=referral&utm_source=unsplash">Maksym
+        Kaharlytskyi</a>&nbsp;on&nbsp;<a
         href="https://unsplash.com/photos/file-cabinet-Q9y3LRuuxmg?utm_content=creditCopyText&utm_medium=referral&utm_source=unsplash">Unsplash</a>
       </v-label>
     </v-card-item>
 
     <v-card-text class="mt-5 mb-5">
       <v-row justify="center">
-        <v-form cols="12" sm="6" md="4">
-          <input type="submit" hidden/><!-- Required for the form to submit on enter -->
-          <v-btn color="black" border @click="exportData" variant="text">
-            Start Export
-          </v-btn>
-        </v-form>
+        <v-btn color="black" border @click="exportData" variant="text">
+          Start Export
+        </v-btn>
       </v-row>
     </v-card-text>
 
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/CardControllerIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/CardControllerIT.java
index c8b71bb..9006b36 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/CardControllerIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/CardControllerIT.java
@@ -14,7 +14,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -35,7 +34,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest(classes = TestMongoConfiguration.class)
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 @AutoConfigureMockMvc
 @DisabledInAotMode
 class CardControllerIT {
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/CardServiceIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/CardServiceIT.java
index f9abfc2..1aa42be 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/CardServiceIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/CardServiceIT.java
@@ -28,7 +28,6 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -47,7 +46,6 @@
 @DataMongoTest
 @EnableMongoAuditing
 @ContextConfiguration(classes = TestMongoConfiguration.class)
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 class CardServiceIT {
 
     private static final String PATH = "/json/cards.json";
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryControllerIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryControllerIT.java
index 91b3672..9585c0a 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryControllerIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryControllerIT.java
@@ -10,7 +10,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -29,7 +28,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest(classes = TestMongoConfiguration.class)
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 @AutoConfigureMockMvc
 @DisabledInAotMode
 class CategoryControllerIT {
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryServiceIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryServiceIT.java
index 4c88b2d..b75f4ae 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryServiceIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/CategoryServiceIT.java
@@ -18,7 +18,6 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,7 +31,6 @@
 
 @DataMongoTest
 @ContextConfiguration(classes = TestMongoConfiguration.class)
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 class CategoryServiceIT {
 
     @Autowired
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/ExampleDataInitializerIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/ExampleDataInitializerIT.java
index a45bc79..de693ea 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/ExampleDataInitializerIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/ExampleDataInitializerIT.java
@@ -7,12 +7,10 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(classes = TestMongoConfiguration.class)
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 class ExampleDataInitializerIT {
 
     // needed since otherwise test tries to connect to Authorization server on AppContext creation
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/RedirectControllerIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/RedirectControllerIT.java
index 2e738cd..39460b2 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/RedirectControllerIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/RedirectControllerIT.java
@@ -15,7 +15,6 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.Set;
@@ -38,7 +37,6 @@
 
 @WebMvcTest({RedirectController.class, CategoryController.class,
         AuthenticationResolver.class, ObservabilityConfiguration.class})
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 class RedirectControllerIT {
 
     // needed since otherwise test tries to connect to Authorization server on Spring security context creation
diff --git a/server/src/test/java/org/hyperskill/community/flashcards/integration/RegistrationIT.java b/server/src/test/java/org/hyperskill/community/flashcards/integration/RegistrationIT.java
index 8119684..e148a86 100644
--- a/server/src/test/java/org/hyperskill/community/flashcards/integration/RegistrationIT.java
+++ b/server/src/test/java/org/hyperskill/community/flashcards/integration/RegistrationIT.java
@@ -13,7 +13,6 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,7 +21,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest(classes = TestMongoConfiguration.class)
-@TestPropertySource(properties = {"spring.profiles.active=test"})
 @AutoConfigureMockMvc
 class RegistrationIT {
 
diff --git a/server/src/test/resources/application.properties b/server/src/test/resources/application.properties
new file mode 100644
index 0000000..5681c24
--- /dev/null
+++ b/server/src/test/resources/application.properties
@@ -0,0 +1,14 @@
+spring.profiles.active=test
+
+spring.security.oauth2.client.registration.spring.provider=spring
+spring.security.oauth2.client.registration.spring.client-id=flashcards
+spring.security.oauth2.client.registration.spring.client-secret=secret
+spring.security.oauth2.client.registration.spring.client-authentication-method=client_secret_basic
+spring.security.oauth2.client.registration.spring.authorization-grant-type=authorization_code
+spring.security.oauth2.client.registration.spring.redirect-uri={baseUrl}/login/oauth2/code/{registrationId}
+spring.security.oauth2.client.registration.spring.scope=user.read,user.write,openid
+
+spring.security.oauth2.client.provider.spring.issuer-uri=http://localhost:8000
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:8000
+
+logging.level.org.hyperskill.community=trace