diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index ff9696e..e805548 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.0" />
+    <option name="version" value="1.9.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 11eef74..3122379 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,14 +23,14 @@ plugins {
 
 android {
     namespace = "com.mohandass.botforge"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.mohandass.botforge"
         minSdk = 28
-        targetSdk = 33
-        versionCode = 32
-        versionName = "1.3.2"
+        targetSdk = 34
+        versionCode = 33
+        versionName = "1.3.3"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -50,7 +50,6 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
 
-            @Suppress("UnstableApiUsage")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -67,13 +66,12 @@ android {
         jvmTarget = "1.8"
     }
 
-    @Suppress("UnstableApiUsage")
     buildFeatures {
         compose = true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.2.0"
+        kotlinCompilerExtensionVersion = "1.5.4"
     }
 
     packaging {
@@ -89,18 +87,18 @@ configurations {
 
 dependencies {
     val composeBomVersion = "2023.04.00"
-    val activityVersion = "1.7.0"
-    val coreVersion = "1.10.0"
-    val lifecycleVersion = "2.6.1"
-    val navVersion = "2.5.3"
-    val composeRuntimeVersion = "1.4.1"
+    val activityVersion = "1.8.1"
+    val coreVersion = "1.12.0"
+    val lifecycleVersion = "2.6.2"
+    val navVersion = "2.7.5"
+    val composeRuntimeVersion = "1.5.4"
     val datastorePreferencesVersion = "1.0.0"
-    val roomVersion = "2.5.1"
-    val daggerHiltVersion = "2.45"
-    val hiltNavVersion = "1.0.0"
+    val roomVersion = "2.6.0"
+    val daggerHiltVersion = "2.48"
+    val hiltNavVersion = "1.1.0"
     val firebaseBomVersion = "31.5.0"
     val gsonVersion = "2.10.1"
-    val openaiKotlinVersion = "3.2.1"
+    val openaiKotlinVersion = "3.5.1"
     val percentageUnitsVersion = "1.0.0"
     val prettytimeVersion = "5.0.6.Final"
     val aboutLibsRelease = "10.6.2"
@@ -109,9 +107,9 @@ dependencies {
     val coilVersion = "2.3.0"
     val markwonVersion = "4.6.2"
     val leakCanaryVersion = "2.10"
-    val okioVersion = "3.3.0"
+    val okioVersion = "3.4.0"
 
-    val playServicesAuthVersion = "20.5.0"
+    val playServicesAuthVersion = "20.7.0"
 
     // Compose BOM
     implementation(platform("androidx.compose:compose-bom:$composeBomVersion"))
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 947b95b..e89be3a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -40,3 +40,5 @@
 
 -dontwarn org.jetbrains.annotations.NotNull
 -dontwarn org.jetbrains.annotations.Nullable
+
+-dontwarn org.intellij.lang.annotations.Language
diff --git a/app/src/main/java/com/mohandass/botforge/chat/model/Message.kt b/app/src/main/java/com/mohandass/botforge/chat/model/Message.kt
index 4c1c416..07214de 100644
--- a/app/src/main/java/com/mohandass/botforge/chat/model/Message.kt
+++ b/app/src/main/java/com/mohandass/botforge/chat/model/Message.kt
@@ -38,8 +38,14 @@ data class Message(
     companion object {
         @OptIn(BetaOpenAI::class)
         fun from(message: ChatMessage): Message {
+            val text = message.content
+            var nonNullText = ""
+
+            if (text != null) {
+                nonNullText = text
+            }
             return Message(
-                text = message.content,
+                text = nonNullText,
                 role = Role.from(message.role),
                 uuid = UUID.randomUUID().toString(),
             )
diff --git a/app/src/main/java/com/mohandass/botforge/chat/model/OpenAiApi.kt b/app/src/main/java/com/mohandass/botforge/chat/model/OpenAiApi.kt
index e263739..1ee81c2 100644
--- a/app/src/main/java/com/mohandass/botforge/chat/model/OpenAiApi.kt
+++ b/app/src/main/java/com/mohandass/botforge/chat/model/OpenAiApi.kt
@@ -16,8 +16,14 @@ import java.util.*
 
 @OptIn(BetaOpenAI::class)
 fun ChatMessage.toMessage(): Message {
+    val text = this.content
+    var nonNullText = ""
+
+    if (text != null) {
+        nonNullText = text
+    }
     return Message(
-        text = this.content,
+        text = nonNullText,
         role = Role.from(this.role),
         uuid = UUID.randomUUID().toString(),
     )
diff --git a/app/src/main/java/com/mohandass/botforge/common/services/implementation/OpenAiService.kt b/app/src/main/java/com/mohandass/botforge/common/services/implementation/OpenAiService.kt
index 536294e..032719c 100644
--- a/app/src/main/java/com/mohandass/botforge/common/services/implementation/OpenAiService.kt
+++ b/app/src/main/java/com/mohandass/botforge/common/services/implementation/OpenAiService.kt
@@ -67,7 +67,6 @@ class OpenAiServiceImpl private constructor(
         }
     }
 
-    @OptIn(BetaOpenAI::class)
     override suspend fun getChatCompletion(
         messages: List<Message>,
     ): Message {
@@ -89,7 +88,7 @@ class OpenAiServiceImpl private constructor(
 
             val metadata = MessageMetadata(
                 openAiId = completion.id,
-                finishReason = completion.choices[0].finishReason,
+                finishReason = completion.choices[0].finishReason.toString(),
                 promptTokens = completion.usage?.promptTokens,
                 completionTokens = completion.usage?.completionTokens,
                 totalTokens = completion.usage?.totalTokens,
@@ -99,7 +98,7 @@ class OpenAiServiceImpl private constructor(
             sharedPreferencesService.incrementUsageTokens(completion.usage?.totalTokens ?: 0)
 
             return Message(
-                text = completion.choices[0].message?.content?.trim() ?: "",
+                text = completion.choices[0].message.content?.trim() ?: "",
                 role = Role.BOT,
                 metadata = metadata,
             )
@@ -109,7 +108,6 @@ class OpenAiServiceImpl private constructor(
         }
     }
 
-    @OptIn(BetaOpenAI::class)
     override suspend fun generateImage(
         prompt: String,
         n: Int,
diff --git a/app/src/main/java/com/mohandass/botforge/image/ui/ImageUi.kt b/app/src/main/java/com/mohandass/botforge/image/ui/ImageUi.kt
index 399c28d..f51a7f8 100644
--- a/app/src/main/java/com/mohandass/botforge/image/ui/ImageUi.kt
+++ b/app/src/main/java/com/mohandass/botforge/image/ui/ImageUi.kt
@@ -12,9 +12,11 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
@@ -27,6 +29,9 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PageSize
+import androidx.compose.foundation.pager.PagerDefaults
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -112,7 +117,13 @@ fun ImageUi(
 
     val listState = rememberLazyListState()
     val coroutineScope = rememberCoroutineScope()
-    val pagerState by imageViewModel.pagerState
+    val pagerState = rememberPagerState(
+        initialPage = 0,
+        initialPageOffsetFraction = 0f
+    ) {
+        // provide pageCount
+        maxImageCount
+    }
 
     val userPreferences by appViewModel.appState.userPreferences.observeAsState()
     userPreferences?.let {
@@ -215,20 +226,31 @@ fun ImageUi(
                     HorizontalPager(
                         modifier = Modifier
                             .fillMaxSize(),
-                        pageCount = maxImageCount,
                         state = pagerState,
-                    ) { position ->
-                        AsyncImage(
-                            modifier = Modifier
-                                .fillMaxWidth(),
-                            model = ImageRequest.Builder(LocalContext.current)
-                                .data(imageUriList[position])
-                                .placeholder(R.drawable.picture)
-                                .crossfade(true)
-                                .build(),
-                            contentDescription = null
-                        )
-                    }
+                        pageSpacing = 0.dp,
+                        userScrollEnabled = true,
+                        reverseLayout = false,
+                        contentPadding = PaddingValues(0.dp),
+                        beyondBoundsPageCount = 0,
+                        pageSize = PageSize.Fill,
+                        flingBehavior = PagerDefaults.flingBehavior(state = pagerState),
+                        key = null,
+                        pageNestedScrollConnection = PagerDefaults.pageNestedScrollConnection(
+                            Orientation.Horizontal
+                        ),
+                        pageContent = { position ->
+                            AsyncImage(
+                                modifier = Modifier
+                                    .fillMaxWidth(),
+                                model = ImageRequest.Builder(LocalContext.current)
+                                    .data(imageUriList[position])
+                                    .placeholder(R.drawable.picture)
+                                    .crossfade(true)
+                                    .build(),
+                                contentDescription = null
+                            )
+                        }
+                    )
                 }
             }
 
@@ -280,7 +302,9 @@ fun ImageUi(
 
                         IconButton(
                             onClick = {
-                                imageViewModel.generateImageVariant()
+                                imageViewModel.generateImageVariant(
+                                    pagerState.currentPage,
+                                )
                             }
                         ) {
                             Icon(
@@ -291,7 +315,7 @@ fun ImageUi(
 
                         IconButton(
                             onClick = {
-                                imageViewModel.shareImage(context)
+                                imageViewModel.shareImage(context, pagerState.currentPage)
                             }
                         ) {
                             Icon(
diff --git a/app/src/main/java/com/mohandass/botforge/image/viewmodel/ImageViewModel.kt b/app/src/main/java/com/mohandass/botforge/image/viewmodel/ImageViewModel.kt
index d513083..9b59b3f 100644
--- a/app/src/main/java/com/mohandass/botforge/image/viewmodel/ImageViewModel.kt
+++ b/app/src/main/java/com/mohandass/botforge/image/viewmodel/ImageViewModel.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
@@ -117,9 +116,6 @@ class ImageViewModel @Inject constructor(
     val imageUriList = mutableStateListOf<Any>()
     var maxImageCount = mutableStateOf(imageUriList.size)
 
-    @OptIn(ExperimentalFoundationApi::class)
-    val pagerState = mutableStateOf(PagerState())
-
     private lateinit var job: Job
     private lateinit var timerJob: Job
 
@@ -245,21 +241,19 @@ class ImageViewModel @Inject constructor(
         }
     }
 
-    @OptIn(ExperimentalFoundationApi::class)
-    fun shareImage(context: Context) {
+    fun shareImage(context: Context, imageIndex: Int) {
         logger.logVerbose(TAG, "shareImage()")
         FileUtils.exportBitmapAsPng(
             title = prompt.value,
-            bitmap = imageUriList[pagerState.value.currentPage] as Bitmap,
+            bitmap = imageUriList[imageIndex] as Bitmap,
             context = context
         )
 
         analytics.logImageExported()
     }
 
-    @OptIn(BetaOpenAI::class, ExperimentalFoundationApi::class)
-    fun generateImageVariant() {
-        val originalBitmap = imageUriList[pagerState.value.currentPage] as Bitmap
+    fun generateImageVariant(imageIndex: Int) {
+        val originalBitmap = imageUriList[imageIndex] as Bitmap
         val stream = ByteArrayOutputStream()
         originalBitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
 
diff --git a/app/src/main/java/com/mohandass/botforge/onboarding/ui/OnBoarding.kt b/app/src/main/java/com/mohandass/botforge/onboarding/ui/OnBoarding.kt
index 515f49b..1e0390d 100644
--- a/app/src/main/java/com/mohandass/botforge/onboarding/ui/OnBoarding.kt
+++ b/app/src/main/java/com/mohandass/botforge/onboarding/ui/OnBoarding.kt
@@ -34,10 +34,17 @@ fun OnBoarding(
     appViewModel: AppViewModel = hiltViewModel(),
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val pagerState = rememberPagerState()
 
     val pageCount = 4
 
+    val pagerState = rememberPagerState(
+        initialPage = 0,
+        initialPageOffsetFraction = 0f
+    ) {
+        // provide pageCount
+        pageCount
+    }
+
     LaunchedEffect(Unit) {
         delay(500)
         pagerState.animateScrollToPage(
@@ -54,46 +61,46 @@ fun OnBoarding(
         Column(modifier = Modifier.fillMaxSize()) {
             VerticalPager(
                 modifier = Modifier.weight(10f),
-                pageCount = pageCount,
                 state = pagerState,
-            ) { position ->
-                when (position) {
-                    0 -> OnBoardingUi1Logo()
-                    1 -> OnBoardingUi2Welcome(
-                        onNext = {
-                            coroutineScope.launch {
-                                pagerState.animateScrollToPage(2)
+                pageContent = { position ->
+                    when (position) {
+                        0 -> OnBoardingUi1Logo()
+                        1 -> OnBoardingUi2Welcome(
+                            onNext = {
+                                coroutineScope.launch {
+                                    pagerState.animateScrollToPage(2)
+                                }
                             }
-                        }
-                    )
+                        )
 
-                    2 -> OnBoardingUi3Api(
-                        initialApiKey = onBoardingViewModel.getApiKey(),
-                        saveApiKey = {
-                            onBoardingViewModel.setApiKey(it)
-                        },
-                        onNext = {
-                            coroutineScope.launch {
-                                pagerState.animateScrollToPage(3)
+                        2 -> OnBoardingUi3Api(
+                            initialApiKey = onBoardingViewModel.getApiKey(),
+                            saveApiKey = {
+                                onBoardingViewModel.setApiKey(it)
+                            },
+                            onNext = {
+                                coroutineScope.launch {
+                                    pagerState.animateScrollToPage(3)
+                                }
                             }
-                        }
-                    )
+                        )
 
-                    3 -> OnBoardingUi4Ugc(
-                        saveUserGeneratedContent = {
-                            onBoardingViewModel.setUserGeneratedContent(it)
-                        },
-                        onComplete = {
-                            onBoardingViewModel.setOnBoardingCompleted()
-                            appViewModel.appState.navController.navigate(AppRoutes.Main.route) {
-                                popUpTo(AppRoutes.OnBoarding.route) { inclusive = true }
+                        3 -> OnBoardingUi4Ugc(
+                            saveUserGeneratedContent = {
+                                onBoardingViewModel.setUserGeneratedContent(it)
+                            },
+                            onComplete = {
+                                onBoardingViewModel.setOnBoardingCompleted()
+                                appViewModel.appState.navController.navigate(AppRoutes.Main.route) {
+                                    popUpTo(AppRoutes.OnBoarding.route) { inclusive = true }
+                                }
                             }
-                        }
-                    )
+                        )
 
-                    else -> OnBoardingUi1Logo()
+                        else -> OnBoardingUi1Logo()
+                    }
                 }
-            }
+            )
         }
         Row(
             Modifier
diff --git a/build.gradle.kts b/build.gradle.kts
index 62041cb..0f0e8c2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    val androidVersion = "8.0.0"
-    val kotlinVersion = "1.7.0"
+    val androidVersion = "8.1.4"
+    val kotlinVersion = "1.9.20"
 
-    val daggerHiltVersion = "2.44"
+    val daggerHiltVersion = "2.48.1"
     val aboutLibsRelease = "10.6.1"
 
     id("com.android.application") version androidVersion apply false
@@ -22,8 +22,8 @@ buildscript {
     }
 
     dependencies {
-        val googleServicesVersion = "4.3.15"
-        val firebaseCrashlyticsVersion = "2.9.4"
+        val googleServicesVersion = "4.4.0"
+        val firebaseCrashlyticsVersion = "2.9.9"
         val firebasePerformanceVersion = "1.4.2"
 
         // Google services Gradle plugin