diff --git a/pages/Behavioral Screen.py b/pages/Behavioral Screen.py
index 5d77716..560db33 100644
--- a/pages/Behavioral Screen.py	
+++ b/pages/Behavioral Screen.py	
@@ -205,12 +205,10 @@ def answer_call_back():
             evaluation = st.session_state.feedback.run("please give evalution regarding the interview")
             st.markdown(evaluation)
             st.stop()
-
     # keep interview
     else:
         with answer_placeholder:
             answer = audio_recorder(pause_threshold=2.5, sample_rate=44100)
-
             if answer:
                 st.session_state['answer'] = answer
                 audio = answer_call_back()
@@ -221,27 +219,12 @@ def answer_call_back():
             for answer in st.session_state.history:
                 if answer:
                     if answer.origin == 'ai':
-                        div = f"""<div class="chat-row">
-                                        <img class="chat-icon" src="static/images/chat.png" width=32 height=32>
-                                        <div class="chat-bubble ai-bubble">
-                                            &#8203;{answer.message}
-                                        </div>
-                                    </div>
-                                    """
-                        st.markdown(div, unsafe_allow_html=True)
-                        st.write(audio)
-
+                        with st.chat_message("assistant"):
+                            st.write(answer.message)
+                            st.write(audio)
                     else:
-                        div = f"""<div class="chat-row row-reverse">
-                                        <img class="chat-icon" src="static/images/user.png" width=32 height=32>
-                                        <div class="chat-bubble human-bubble">
-                                            &#8203;{answer.message}
-                                        </div>
-                                    </div>
-                                    """
-                        st.markdown(div, unsafe_allow_html=True)
-                for _ in range(3):
-                    st.markdown("")
+                        with st.chat_message("user"):
+                            st.write(answer.message)
 
         credit_card_placeholder.caption(f"""
                         Used {st.session_state.token_count} tokens \n
diff --git a/pages/Resume Screen.py b/pages/Resume Screen.py
index 73fec4d..82f851c 100644
--- a/pages/Resume Screen.py	
+++ b/pages/Resume Screen.py	
@@ -222,28 +222,12 @@ def answer_call_back():
             for answer in st.session_state.resume_history:
                 if answer:
                     if answer.origin == 'ai':
-                        div = f"""<div class="chat-row">
-                                        <img class="chat-icon" src="static/images/chat.png" width=32 height=32>
-                                        <div class="chat-bubble ai-bubble">
-                                            &#8203;{answer.message}
-                                        </div>
-                                    </div>
-                                    """
-                        st.markdown(div, unsafe_allow_html=True)
-                        st.write(audio_widget)
-
+                        with st.chat_message("assistant"):
+                            st.write(answer.message)
+                            st.write(audio_widget)
                     else:
-                        div = f"""<div class="chat-row row-reverse">
-                                        <img class="chat-icon" src="static/images/user.png" width=32 height=32>
-                                        <div class="chat-bubble human-bubble">
-                                            &#8203;{answer.message}
-                                        </div>
-                                    </div>
-                                    """
-                        st.markdown(div, unsafe_allow_html=True)
-
-                for _ in range(3):
-                    st.markdown("")
+                        with st.chat_message("user"):
+                            st.write(answer.message)
 
         credit_card_placeholder.caption(f"""
                         Used {st.session_state.token_count} tokens \n
diff --git a/pages/Technical Screen.py b/pages/Technical Screen.py
index 1e94ce2..080a562 100644
--- a/pages/Technical Screen.py	
+++ b/pages/Technical Screen.py	
@@ -207,30 +207,14 @@ def answer_call_back():
 
         with chat_placeholder:
             for answer in st.session_state.jd_history:
-                if answer:
-                    if answer.origin == 'ai':
-                        div = f"""<div class="chat-row">
-                                        <img class="chat-icon" src="static/images/chat.png" width=32 height=32>
-                                        <div class="chat-bubble ai-bubble">
-                                            &#8203;{answer.message}
-                                        </div>
-                                    </div>
-                                    """
-                        st.markdown(div, unsafe_allow_html=True)
+                #if answer:
+                if answer.origin == 'ai':
+                    with st.chat_message("assistant"):
+                        st.write(answer.message)
                         st.write(audio_widget)
-
-                    else:
-                        div = f"""<div class="chat-row row-reverse">
-                                        <img class="chat-icon" src="static/images/user.png" width=32 height=32>
-                                        <div class="chat-bubble human-bubble">
-                                            &#8203;{answer.message}
-                                        </div>
-                                    </div>
-                                    """
-                        st.markdown(div, unsafe_allow_html=True)
-
-                for _ in range(3):
-                    st.markdown("")
+                else:
+                    with st.chat_message("user"):
+                        st.write(answer.message)
 
         credit_card_placeholder.caption(f"""
         Used {st.session_state.token_count} tokens \n
diff --git a/temp/audio.wav b/temp/audio.wav
index bac48b3..ce8dbc2 100644
Binary files a/temp/audio.wav and b/temp/audio.wav differ