diff --git a/css/main.css b/css/main.css
index f0bbe02..b4cf5fd 100644
--- a/css/main.css
+++ b/css/main.css
@@ -794,6 +794,7 @@ h3 {
   position: relative;
   padding-bottom: 0.5rem;
   color: rgba(var(--text-color), 0.8);
+  margin-right: auto;
 }
 .loan-process__type::before {
   content: "";
diff --git a/css/main.min.css b/css/main.min.css
index 29011d5..af42b72 100644
--- a/css/main.min.css
+++ b/css/main.min.css
@@ -1 +1 @@
-*{padding:0;margin:0;box-sizing:border-box;font-family:"Roboto",sans-serif}:root{font-size:clamp(1rem,1.2vmax,1.5rem)}html,body{height:100%}body{--accent-color: #365eff;--text-color: 30, 30, 30;--background-color: 248, 248, 248;--foreground-color: 255, 255, 255;--danger-color: rgb(255, 75, 75);--green: #1cad59;scrollbar-width:thin;scrollbar-gutter:stable;color:rgba(var(--text-color), 1);background-color:rgba(var(--background-color), 1);transition:background-color .3s}body[data-theme=dark]{--accent-color: #86afff;--text-color: 220, 220, 220;--background-color: 10, 10, 10;--foreground-color: 24, 24, 24;--danger-color: rgb(255, 106, 106);--green: #00e676}body[data-theme=dark] sm-popup::part(popup){background-color:rgba(var(--foreground-color), 1)}body[data-theme=dark] ::-webkit-calendar-picker-indicator{filter:invert(1)}p,strong{font-size:.9rem;max-width:65ch;line-height:1.7;color:rgba(var(--text-color), 0.9)}p:not(:last-of-type),strong:not(:last-of-type){margin-bottom:1.5rem}a{text-decoration:none;color:var(--accent-color)}a:focus-visible{box-shadow:0 0 0 .1rem rgba(var(--text-color), 1) inset}button,.button{-webkit-user-select:none;-moz-user-select:none;user-select:none;position:relative;display:inline-flex;border:none;background-color:rgba(0,0,0,0);overflow:hidden;color:inherit;-webkit-tap-highlight-color:rgba(0,0,0,0);align-items:center;font-size:inherit;font-weight:500;white-space:nowrap;padding:.6rem .9rem;border-radius:.3rem;justify-content:center}button:focus-visible,.button:focus-visible{outline:var(--accent-color) solid medium}button:not(:disabled),.button:not(:disabled){cursor:pointer}.button{background-color:rgba(var(--text-color), 0.02);border:solid thin rgba(var(--text-color), 0.06)}.button--primary{color:rgba(var(--background-color), 1);background-color:var(--accent-color)}.button--primary .icon{fill:rgba(var(--background-color), 1)}.button--colored{color:var(--accent-color)}.button--colored .icon{fill:var(--accent-color)}.button--danger{background-color:rgba(255,115,115,.062745098);color:var(--danger-color)}.button--danger .icon{fill:var(--danger-color)}.button--small{padding:.4rem .6rem}.button--outlined{border:solid rgba(var(--text-color), 0.3) .1rem;background-color:rgba(var(--foreground-color), 1)}.button--transparent{background-color:rgba(0,0,0,0)}button:disabled{cursor:not-allowed;background-color:rgba(var(--text-color), 0.03);color:rgba(var(--text-color), 0.5)}.cta{text-transform:uppercase;font-size:.9rem;font-weight:700;letter-spacing:.05em;padding:.8rem 1rem}.icon{width:1.2rem;height:1.2rem;fill:rgba(var(--text-color), 0.8);flex-shrink:0}.icon-only{padding:.5rem;border-radius:.3rem}.icon--big{width:3rem;height:3rem}a:-webkit-any-link:focus-visible{outline:rgba(var(--text-color), 1) .1rem solid}a:-moz-any-link:focus-visible{outline:rgba(var(--text-color), 1) .1rem solid}a:any-link:focus-visible{outline:rgba(var(--text-color), 1) .1rem solid}details{padding:1rem 0}details summary{display:flex;-webkit-user-select:none;-moz-user-select:none;user-select:none;cursor:pointer;align-items:center;gap:.5rem;color:var(--accent-color);font-weight:500}details summary .down-arrow{fill:var(--accent-color)}details[open] summary{margin-bottom:1rem}details[open]>summary .down-arrow{transform:rotate(180deg)}sm-input,sm-textarea{font-size:.9rem;--border-radius: 0.5rem;--background-color: rgba(var(--foreground-color), 1)}sm-input button .icon,sm-textarea button .icon{fill:var(--accent-color)}sm-textarea{--max-height: auto}sm-spinner{--size: 1rem;--stroke-width: 0.1rem}sm-form{--gap: 1rem}sm-chips{--gap: 0.3rem}sm-chip{position:relative;font-size:.9rem;--border-radius: 0.5rem;--padding: 0.5rem 0.8rem;--background: rgba(var(--text-color), 0.06);-webkit-user-select:none;-moz-user-select:none;user-select:none}sm-chip[selected=true] .badge{background-color:rgba(var(--foreground-color), 1);color:var(--accent-color)}sm-chip .badge{position:relative;display:flex;align-items:center;justify-content:center;height:1.2rem;border-radius:2rem;margin-left:.5rem;font-weight:700;aspect-ratio:1/1;background-color:var(--accent-color);color:rgba(var(--background-color), 1)}sm-select::part(options){max-height:40vh}sm-option{flex-shrink:0}sm-option::part(option){grid-template-columns:none}ul{list-style:none}fieldset{display:grid;gap:.5rem;padding:1rem;border-radius:.5rem;border:solid 1px rgba(var(--text-color), 0.3)}fieldset legend{font-size:.9rem;font-weight:500}input[type=radio]{height:1.1em;width:1.1em;margin-right:.5rem;accent-color:var(--accent-color)}.overflow-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.wrap-around{overflow-wrap:break-word;word-wrap:break-word;word-break:break-word}.full-bleed{grid-column:1/-1}.h1{font-size:1.5rem}.h2{font-size:1.2rem}h3{font-size:1.2rem;line-height:1.3}.h4{font-size:.9rem}.h5{font-size:.75rem}.uppercase{text-transform:uppercase}.capitalize::first-letter{text-transform:uppercase}.sticky{position:-webkit-sticky;position:sticky}.top-0{top:0}.flex{display:flex}.flex-1{flex:1}.flex-wrap{flex-wrap:wrap}.grid{display:grid}.flow-column{grid-auto-flow:column}.gap-0-3{gap:.3rem}.gap-0-5{gap:.5rem}.gap-1{gap:1rem}.gap-1-5{gap:1.5rem}.gap-2{gap:2rem}.gap-3{gap:3rem}.text-align-right{text-align:right}.align-start{align-content:flex-start}.align-center{align-items:center}.align-end{align-items:flex-end}.align-content-center{align-content:center}.text-center{text-align:center}.justify-start{justify-content:start}.justify-content-center{justify-content:center}.justify-items-center{justify-items:center}.justify-right{margin-left:auto}.justify-items-center{justify-items:center}.align-self-center{align-self:center}.justify-self-center{justify-self:center}.justify-self-start{justify-self:start}.justify-self-end{justify-self:end}.flex-direction-column{flex-direction:column}.space-between{justify-content:space-between}.w-100{width:100%}.h-100{height:100%}.margin-left-0-5{margin-left:.5rem}.margin-left-auto{margin-left:auto}.margin-right-0-5{margin-right:.5rem}.margin-right-auto{margin-right:auto}.ripple{height:8rem;width:8rem;position:absolute;border-radius:50%;transform:scale(0);background:radial-gradient(circle, rgba(var(--text-color), 0.3) 0%, rgba(0, 0, 0, 0) 50%);pointer-events:none}.button--primary .ripple,.button--danger .ripple{background:radial-gradient(circle, rgba(var(--background-color), 0.3) 0%, rgba(0, 0, 0, 0) 50%)}.interact:not([disabled=true]){position:relative;overflow:hidden;cursor:pointer;-webkit-tap-highlight-color:rgba(0,0,0,0)}.empty-state{display:grid;width:100%;padding:1.5rem 0}.observe-empty-state:empty{display:none !important}.observe-empty-state:not(:empty)+.empty-state{display:none}.bullet-point{display:flex;align-items:center;justify-content:center;margin:0 .8ch}.bullet-point::after{content:"";height:.4ch;width:.4ch;border-radius:.5em;background-color:var(--accent-color)}.multi-state-button{display:grid;text-align:center;align-items:center;justify-items:center}.multi-state-button>*{grid-area:1/1/2/2}.multi-state-button button{z-index:1;width:100%}.password-field label{display:flex;justify-content:center}.password-field label input:checked~.visible{display:none}.password-field label input:not(:checked)~.invisible{display:none}#confirmation_popup,#prompt_popup{flex-direction:column}#confirmation_popup h4,#prompt_popup h4{margin-bottom:.5rem}#confirmation_popup .flex,#prompt_popup .flex{margin-top:1rem}.popup__header{position:relative;display:grid;gap:.5rem;width:100%;padding:0 1.5rem 0 .5rem;align-items:center;grid-template-columns:auto 1fr}.popup__header>*{grid-row:1}.popup__header h3,.popup__header h4{grid-column:1/-1;justify-self:center;align-self:center}.popup__header__close{grid-column:1}#app_body{display:block;height:100%;width:100%}#main_header{grid-area:header;background-color:rgba(var(--foreground-color), 1)}#sub_page_container{grid-area:main;padding:max(1rem,1.5vw)}#loading{position:fixed;display:grid;top:0;left:0;bottom:0;right:0;place-content:center;justify-items:center;background:rgba(var(--foreground-color), 1);z-index:10}#loading h4{margin-top:1.5rem;font-weight:500}#loading sm-spinner{--size: 1.5rem}#sign_in,#sign_up{display:grid;width:100%;height:100%;justify-items:center;align-content:center;padding:1.5rem}#sign_in section,#sign_up section{width:min(26rem,100%)}#sign_in sm-form,#sign_up sm-form{margin:2rem 0}.generated-keys-wrapper{padding:1rem;background-color:rgba(var(--foreground-color), 1);border-radius:.5rem}#flo_id_warning{padding-bottom:1.5rem}#flo_id_warning .icon{height:3rem;width:3rem;padding:.8rem;overflow:visible;background-color:#ffc107;border-radius:3rem;fill:rgba(0,0,0,.8)}#main_header{display:flex;gap:1rem;padding:1rem max(1rem,1.5vw);width:100%;align-items:center}.app-brand{display:flex;gap:.3rem;align-items:center}.app-brand .icon{height:1.7rem;width:1.7rem}.app-name__company{font-size:.8rem;font-weight:500;color:rgba(var(--text-color), 0.8)}#user_popup_button{background-color:rgba(var(--text-color), 0.06);border-radius:2rem;font-size:.9rem;text-overflow:ellipsis;overflow:hidden}.card{padding:1.5rem;border-radius:.5rem;box-shadow:0 0 0 1px rgba(var(--text-color), 0.1);background-color:rgba(var(--foreground-color), 1);transition:box-shadow .2s,background-color .2s}#main_page{display:grid;min-width:0;width:min(72rem,100%);margin:auto;grid-template-columns:minmax(0, 1fr);align-items:flex-start}#balance_list{display:flex;flex-wrap:wrap;justify-items:flex-start;gap:.5rem}.balance-card{display:flex;flex:1 1 12rem;justify-content:space-between;padding:.7rem;border-radius:.5rem;background-color:rgba(var(--foreground-color), 1)}.balance-card span:last-of-type{font-weight:700;font-size:1rem}#apply_loan{width:min(64rem,100%);margin:auto}#policy_list{display:grid;width:100%;gap:.5rem;grid-template-columns:repeat(auto-fill, minmax(16rem, 1fr))}.policy{display:grid;grid-template-columns:1fr 1fr;gap:1.5rem;padding:1rem;border-radius:.5rem;background-color:rgba(var(--foreground-color), 1);box-shadow:0 0 0 1px rgba(var(--text-color), 0.1);flex:1 1 12rem}.policy>div h5{font-weight:400;color:rgba(var(--text-color), 0.8)}.policy>div p{font-size:1.1rem;font-weight:500}.policy button{grid-column:1/-1;margin-left:auto}#request_loan_form label{display:flex;align-items:center;gap:.5rem}#request_loan_form label input{height:1.2em;width:1.2em}.loan{display:grid;gap:1rem;background-color:rgba(var(--foreground-color), 1);padding:max(1rem,1.5vw);border-radius:.5rem}.loan-process{display:grid;gap:1rem;background-color:rgba(var(--foreground-color), 1);padding:max(1rem,1.5vw);border-radius:.5rem;--progress-line-thickness: 0.15rem}.loan-process__type{position:relative;padding-bottom:.5rem;color:rgba(var(--text-color), 0.8)}.loan-process__type::before{content:"";position:absolute;height:.2rem;width:40%;left:0;bottom:0;transform:translateY(-50%);border-radius:0 .5rem .5rem 0;background-color:var(--accent-color)}.loan-process ul{display:grid}.loan-process ul li{display:grid;gap:1rem;grid-template-columns:auto 1fr}.loan-process .progress{display:grid;justify-content:center;justify-items:center;isolation:isolate}.loan-process .progress>*{grid-area:1/1/2/2}.loan-process li.done .circle{border-width:.3rem;border-color:var(--green)}.loan-process li.done .line{background-color:var(--green)}.loan-process .circle{margin-top:.2rem;width:.8rem;height:.8rem;border-radius:50%;background-color:rgba(var(--foreground-color), 1);z-index:1;border:solid var(--progress-line-thickness) rgba(var(--text-color), 0.5)}.loan-process .line{margin-top:.2rem;width:var(--progress-line-thickness);height:100%;background-color:rgba(var(--text-color), 0.5)}.loan-process .details{display:grid;gap:.3rem;padding-bottom:2rem}.loan-process .details button{margin-top:.5rem}.loan-process time{font-size:.9rem;color:rgba(var(--text-color), 0.8)}#collateral_requests_list{display:grid;gap:1rem;grid-template-columns:repeat(auto-fill, minmax(20rem, 1fr))}.collateral-request{display:flex;gap:1.5rem;flex-direction:column;background-color:rgba(var(--foreground-color), 1);padding:1rem}.collateral-request b{color:rgba(var(--text-color), 0.9)}#loan_requests_list{display:grid;gap:1rem;align-items:flex-start;grid-template-columns:repeat(auto-fill, minmax(20rem, 1fr))}.loan-request{display:flex;flex-direction:column;justify-items:flex-start;gap:1rem;background-color:rgba(var(--foreground-color), 1);padding:1rem;border-radius:.5rem}.loan-request b{font-weight:500;color:rgba(var(--text-color), 0.9)}.loan-request .button{margin-top:auto}@media screen and (max-width: 40rem){theme-toggle{order:2}#user_popup_button{flex:1;order:1}.hide-on-small{display:none !important}}@media screen and (min-width: 40rem){h1{font-size:3vw}sm-popup{--width: 24rem}.popup__header{padding:1.5rem 1.5rem 0 .75rem}#request_loan_popup{--width: 32rem}}@media screen and (min-width: 46rem){#main_page{grid-template-columns:18rem 1fr}#main_page>:first-child{position:-webkit-sticky;position:sticky;top:1rem;overflow-y:auto}}@media(any-hover: hover){::-webkit-scrollbar{width:.5rem;height:.5rem}::-webkit-scrollbar-thumb{background:rgba(var(--text-color), 0.3);border-radius:1rem}::-webkit-scrollbar-thumb:hover{background:rgba(var(--text-color), 0.5)}.interact:not([disabled]){transition:background-color .3s}.interact:not([disabled]):hover{background-color:rgba(var(--text-color), 0.06)}.button:not([disabled]){transition:background-color .3s,filter .3s}.button:not([disabled]):hover{filter:contrast(2)}}@supports(overflow: overlay){body{overflow:overlay}}.hidden{display:none !important}
\ No newline at end of file
+*{padding:0;margin:0;box-sizing:border-box;font-family:"Roboto",sans-serif}:root{font-size:clamp(1rem,1.2vmax,1.5rem)}html,body{height:100%}body{--accent-color: #365eff;--text-color: 30, 30, 30;--background-color: 248, 248, 248;--foreground-color: 255, 255, 255;--danger-color: rgb(255, 75, 75);--green: #1cad59;scrollbar-width:thin;scrollbar-gutter:stable;color:rgba(var(--text-color), 1);background-color:rgba(var(--background-color), 1);transition:background-color .3s}body[data-theme=dark]{--accent-color: #86afff;--text-color: 220, 220, 220;--background-color: 10, 10, 10;--foreground-color: 24, 24, 24;--danger-color: rgb(255, 106, 106);--green: #00e676}body[data-theme=dark] sm-popup::part(popup){background-color:rgba(var(--foreground-color), 1)}body[data-theme=dark] ::-webkit-calendar-picker-indicator{filter:invert(1)}p,strong{font-size:.9rem;max-width:65ch;line-height:1.7;color:rgba(var(--text-color), 0.9)}p:not(:last-of-type),strong:not(:last-of-type){margin-bottom:1.5rem}a{text-decoration:none;color:var(--accent-color)}a:focus-visible{box-shadow:0 0 0 .1rem rgba(var(--text-color), 1) inset}button,.button{-webkit-user-select:none;-moz-user-select:none;user-select:none;position:relative;display:inline-flex;border:none;background-color:rgba(0,0,0,0);overflow:hidden;color:inherit;-webkit-tap-highlight-color:rgba(0,0,0,0);align-items:center;font-size:inherit;font-weight:500;white-space:nowrap;padding:.6rem .9rem;border-radius:.3rem;justify-content:center}button:focus-visible,.button:focus-visible{outline:var(--accent-color) solid medium}button:not(:disabled),.button:not(:disabled){cursor:pointer}.button{background-color:rgba(var(--text-color), 0.02);border:solid thin rgba(var(--text-color), 0.06)}.button--primary{color:rgba(var(--background-color), 1);background-color:var(--accent-color)}.button--primary .icon{fill:rgba(var(--background-color), 1)}.button--colored{color:var(--accent-color)}.button--colored .icon{fill:var(--accent-color)}.button--danger{background-color:rgba(255,115,115,.062745098);color:var(--danger-color)}.button--danger .icon{fill:var(--danger-color)}.button--small{padding:.4rem .6rem}.button--outlined{border:solid rgba(var(--text-color), 0.3) .1rem;background-color:rgba(var(--foreground-color), 1)}.button--transparent{background-color:rgba(0,0,0,0)}button:disabled{cursor:not-allowed;background-color:rgba(var(--text-color), 0.03);color:rgba(var(--text-color), 0.5)}.cta{text-transform:uppercase;font-size:.9rem;font-weight:700;letter-spacing:.05em;padding:.8rem 1rem}.icon{width:1.2rem;height:1.2rem;fill:rgba(var(--text-color), 0.8);flex-shrink:0}.icon-only{padding:.5rem;border-radius:.3rem}.icon--big{width:3rem;height:3rem}a:-webkit-any-link:focus-visible{outline:rgba(var(--text-color), 1) .1rem solid}a:-moz-any-link:focus-visible{outline:rgba(var(--text-color), 1) .1rem solid}a:any-link:focus-visible{outline:rgba(var(--text-color), 1) .1rem solid}details{padding:1rem 0}details summary{display:flex;-webkit-user-select:none;-moz-user-select:none;user-select:none;cursor:pointer;align-items:center;gap:.5rem;color:var(--accent-color);font-weight:500}details summary .down-arrow{fill:var(--accent-color)}details[open] summary{margin-bottom:1rem}details[open]>summary .down-arrow{transform:rotate(180deg)}sm-input,sm-textarea{font-size:.9rem;--border-radius: 0.5rem;--background-color: rgba(var(--foreground-color), 1)}sm-input button .icon,sm-textarea button .icon{fill:var(--accent-color)}sm-textarea{--max-height: auto}sm-spinner{--size: 1rem;--stroke-width: 0.1rem}sm-form{--gap: 1rem}sm-chips{--gap: 0.3rem}sm-chip{position:relative;font-size:.9rem;--border-radius: 0.5rem;--padding: 0.5rem 0.8rem;--background: rgba(var(--text-color), 0.06);-webkit-user-select:none;-moz-user-select:none;user-select:none}sm-chip[selected=true] .badge{background-color:rgba(var(--foreground-color), 1);color:var(--accent-color)}sm-chip .badge{position:relative;display:flex;align-items:center;justify-content:center;height:1.2rem;border-radius:2rem;margin-left:.5rem;font-weight:700;aspect-ratio:1/1;background-color:var(--accent-color);color:rgba(var(--background-color), 1)}sm-select::part(options){max-height:40vh}sm-option{flex-shrink:0}sm-option::part(option){grid-template-columns:none}ul{list-style:none}fieldset{display:grid;gap:.5rem;padding:1rem;border-radius:.5rem;border:solid 1px rgba(var(--text-color), 0.3)}fieldset legend{font-size:.9rem;font-weight:500}input[type=radio]{height:1.1em;width:1.1em;margin-right:.5rem;accent-color:var(--accent-color)}.overflow-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.wrap-around{overflow-wrap:break-word;word-wrap:break-word;word-break:break-word}.full-bleed{grid-column:1/-1}.h1{font-size:1.5rem}.h2{font-size:1.2rem}h3{font-size:1.2rem;line-height:1.3}.h4{font-size:.9rem}.h5{font-size:.75rem}.uppercase{text-transform:uppercase}.capitalize::first-letter{text-transform:uppercase}.sticky{position:-webkit-sticky;position:sticky}.top-0{top:0}.flex{display:flex}.flex-1{flex:1}.flex-wrap{flex-wrap:wrap}.grid{display:grid}.flow-column{grid-auto-flow:column}.gap-0-3{gap:.3rem}.gap-0-5{gap:.5rem}.gap-1{gap:1rem}.gap-1-5{gap:1.5rem}.gap-2{gap:2rem}.gap-3{gap:3rem}.text-align-right{text-align:right}.align-start{align-content:flex-start}.align-center{align-items:center}.align-end{align-items:flex-end}.align-content-center{align-content:center}.text-center{text-align:center}.justify-start{justify-content:start}.justify-content-center{justify-content:center}.justify-items-center{justify-items:center}.justify-right{margin-left:auto}.justify-items-center{justify-items:center}.align-self-center{align-self:center}.justify-self-center{justify-self:center}.justify-self-start{justify-self:start}.justify-self-end{justify-self:end}.flex-direction-column{flex-direction:column}.space-between{justify-content:space-between}.w-100{width:100%}.h-100{height:100%}.margin-left-0-5{margin-left:.5rem}.margin-left-auto{margin-left:auto}.margin-right-0-5{margin-right:.5rem}.margin-right-auto{margin-right:auto}.ripple{height:8rem;width:8rem;position:absolute;border-radius:50%;transform:scale(0);background:radial-gradient(circle, rgba(var(--text-color), 0.3) 0%, rgba(0, 0, 0, 0) 50%);pointer-events:none}.button--primary .ripple,.button--danger .ripple{background:radial-gradient(circle, rgba(var(--background-color), 0.3) 0%, rgba(0, 0, 0, 0) 50%)}.interact:not([disabled=true]){position:relative;overflow:hidden;cursor:pointer;-webkit-tap-highlight-color:rgba(0,0,0,0)}.empty-state{display:grid;width:100%;padding:1.5rem 0}.observe-empty-state:empty{display:none !important}.observe-empty-state:not(:empty)+.empty-state{display:none}.bullet-point{display:flex;align-items:center;justify-content:center;margin:0 .8ch}.bullet-point::after{content:"";height:.4ch;width:.4ch;border-radius:.5em;background-color:var(--accent-color)}.multi-state-button{display:grid;text-align:center;align-items:center;justify-items:center}.multi-state-button>*{grid-area:1/1/2/2}.multi-state-button button{z-index:1;width:100%}.password-field label{display:flex;justify-content:center}.password-field label input:checked~.visible{display:none}.password-field label input:not(:checked)~.invisible{display:none}#confirmation_popup,#prompt_popup{flex-direction:column}#confirmation_popup h4,#prompt_popup h4{margin-bottom:.5rem}#confirmation_popup .flex,#prompt_popup .flex{margin-top:1rem}.popup__header{position:relative;display:grid;gap:.5rem;width:100%;padding:0 1.5rem 0 .5rem;align-items:center;grid-template-columns:auto 1fr}.popup__header>*{grid-row:1}.popup__header h3,.popup__header h4{grid-column:1/-1;justify-self:center;align-self:center}.popup__header__close{grid-column:1}#app_body{display:block;height:100%;width:100%}#main_header{grid-area:header;background-color:rgba(var(--foreground-color), 1)}#sub_page_container{grid-area:main;padding:max(1rem,1.5vw)}#loading{position:fixed;display:grid;top:0;left:0;bottom:0;right:0;place-content:center;justify-items:center;background:rgba(var(--foreground-color), 1);z-index:10}#loading h4{margin-top:1.5rem;font-weight:500}#loading sm-spinner{--size: 1.5rem}#sign_in,#sign_up{display:grid;width:100%;height:100%;justify-items:center;align-content:center;padding:1.5rem}#sign_in section,#sign_up section{width:min(26rem,100%)}#sign_in sm-form,#sign_up sm-form{margin:2rem 0}.generated-keys-wrapper{padding:1rem;background-color:rgba(var(--foreground-color), 1);border-radius:.5rem}#flo_id_warning{padding-bottom:1.5rem}#flo_id_warning .icon{height:3rem;width:3rem;padding:.8rem;overflow:visible;background-color:#ffc107;border-radius:3rem;fill:rgba(0,0,0,.8)}#main_header{display:flex;gap:1rem;padding:1rem max(1rem,1.5vw);width:100%;align-items:center}.app-brand{display:flex;gap:.3rem;align-items:center}.app-brand .icon{height:1.7rem;width:1.7rem}.app-name__company{font-size:.8rem;font-weight:500;color:rgba(var(--text-color), 0.8)}#user_popup_button{background-color:rgba(var(--text-color), 0.06);border-radius:2rem;font-size:.9rem;text-overflow:ellipsis;overflow:hidden}.card{padding:1.5rem;border-radius:.5rem;box-shadow:0 0 0 1px rgba(var(--text-color), 0.1);background-color:rgba(var(--foreground-color), 1);transition:box-shadow .2s,background-color .2s}#main_page{display:grid;min-width:0;width:min(72rem,100%);margin:auto;grid-template-columns:minmax(0, 1fr);align-items:flex-start}#balance_list{display:flex;flex-wrap:wrap;justify-items:flex-start;gap:.5rem}.balance-card{display:flex;flex:1 1 12rem;justify-content:space-between;padding:.7rem;border-radius:.5rem;background-color:rgba(var(--foreground-color), 1)}.balance-card span:last-of-type{font-weight:700;font-size:1rem}#apply_loan{width:min(64rem,100%);margin:auto}#policy_list{display:grid;width:100%;gap:.5rem;grid-template-columns:repeat(auto-fill, minmax(16rem, 1fr))}.policy{display:grid;grid-template-columns:1fr 1fr;gap:1.5rem;padding:1rem;border-radius:.5rem;background-color:rgba(var(--foreground-color), 1);box-shadow:0 0 0 1px rgba(var(--text-color), 0.1);flex:1 1 12rem}.policy>div h5{font-weight:400;color:rgba(var(--text-color), 0.8)}.policy>div p{font-size:1.1rem;font-weight:500}.policy button{grid-column:1/-1;margin-left:auto}#request_loan_form label{display:flex;align-items:center;gap:.5rem}#request_loan_form label input{height:1.2em;width:1.2em}.loan{display:grid;gap:1rem;background-color:rgba(var(--foreground-color), 1);padding:max(1rem,1.5vw);border-radius:.5rem}.loan-process{display:grid;gap:1rem;background-color:rgba(var(--foreground-color), 1);padding:max(1rem,1.5vw);border-radius:.5rem;--progress-line-thickness: 0.15rem}.loan-process__type{position:relative;padding-bottom:.5rem;color:rgba(var(--text-color), 0.8);margin-right:auto}.loan-process__type::before{content:"";position:absolute;height:.2rem;width:40%;left:0;bottom:0;transform:translateY(-50%);border-radius:0 .5rem .5rem 0;background-color:var(--accent-color)}.loan-process ul{display:grid}.loan-process ul li{display:grid;gap:1rem;grid-template-columns:auto 1fr}.loan-process .progress{display:grid;justify-content:center;justify-items:center;isolation:isolate}.loan-process .progress>*{grid-area:1/1/2/2}.loan-process li.done .circle{border-width:.3rem;border-color:var(--green)}.loan-process li.done .line{background-color:var(--green)}.loan-process .circle{margin-top:.2rem;width:.8rem;height:.8rem;border-radius:50%;background-color:rgba(var(--foreground-color), 1);z-index:1;border:solid var(--progress-line-thickness) rgba(var(--text-color), 0.5)}.loan-process .line{margin-top:.2rem;width:var(--progress-line-thickness);height:100%;background-color:rgba(var(--text-color), 0.5)}.loan-process .details{display:grid;gap:.3rem;padding-bottom:2rem}.loan-process .details button{margin-top:.5rem}.loan-process time{font-size:.9rem;color:rgba(var(--text-color), 0.8)}#collateral_requests_list{display:grid;gap:1rem;grid-template-columns:repeat(auto-fill, minmax(20rem, 1fr))}.collateral-request{display:flex;gap:1.5rem;flex-direction:column;background-color:rgba(var(--foreground-color), 1);padding:1rem}.collateral-request b{color:rgba(var(--text-color), 0.9)}#loan_requests_list{display:grid;gap:1rem;align-items:flex-start;grid-template-columns:repeat(auto-fill, minmax(20rem, 1fr))}.loan-request{display:flex;flex-direction:column;justify-items:flex-start;gap:1rem;background-color:rgba(var(--foreground-color), 1);padding:1rem;border-radius:.5rem}.loan-request b{font-weight:500;color:rgba(var(--text-color), 0.9)}.loan-request .button{margin-top:auto}@media screen and (max-width: 40rem){theme-toggle{order:2}#user_popup_button{flex:1;order:1}.hide-on-small{display:none !important}}@media screen and (min-width: 40rem){h1{font-size:3vw}sm-popup{--width: 24rem}.popup__header{padding:1.5rem 1.5rem 0 .75rem}#request_loan_popup{--width: 32rem}}@media screen and (min-width: 46rem){#main_page{grid-template-columns:18rem 1fr}#main_page>:first-child{position:-webkit-sticky;position:sticky;top:1rem;overflow-y:auto}}@media(any-hover: hover){::-webkit-scrollbar{width:.5rem;height:.5rem}::-webkit-scrollbar-thumb{background:rgba(var(--text-color), 0.3);border-radius:1rem}::-webkit-scrollbar-thumb:hover{background:rgba(var(--text-color), 0.5)}.interact:not([disabled]){transition:background-color .3s}.interact:not([disabled]):hover{background-color:rgba(var(--text-color), 0.06)}.button:not([disabled]){transition:background-color .3s,filter .3s}.button:not([disabled]):hover{filter:contrast(2)}}@supports(overflow: overlay){body{overflow:overlay}}.hidden{display:none !important}
\ No newline at end of file
diff --git a/css/main.scss b/css/main.scss
index b8c3181..f7af0f4 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -748,6 +748,7 @@ h3 {
     position: relative;
     padding-bottom: 0.5rem;
     color: rgba(var(--text-color), 0.8);
+    margin-right: auto;
     &::before {
       content: "";
       position: absolute;
diff --git a/index.html b/index.html
index 191dc24..39f5b62 100644
--- a/index.html
+++ b/index.html
@@ -645,299 +645,405 @@
             },
             loanProcess(details = {}) {
                 const {
+                    type,
                     loanOpeningProcessID,
                     borrower, isBorrower, coborrower, isCoborrower, lender, isLender, loanAmount, policyID,
                     initiationTime, loanRequestTime, loanResponseTime, collateralLockAckTime, loanIssuedTime,
                     hasProvidedCollateral, hasAgreedToLend, hasRequestedCollateralLock, hasLockedCollateral, hasIssuedLoan, hasRequestedCollateralRefund,
-                    collateralRequestID, loanRequestID, loanResponseID, collateralLockRequestID, collateralLockAckID, loanID
+                    collateralRequestID, loanRequestID, loanResponseID, collateralLockRequestID, collateralLockAckID, loanID, closingTxID,
+                    loanClosedAckTime, loanClosedAckID, hasPaidLoan, unlockCollateralRequestTime, unlockCollateralRequestID, hasRequestedCollateralUnlock, unlockCollateralAckTime, unlockCollateralAckID, hasRefundedCollateral
                 } = details
-                return Component(() => {
-                    const [verifyingCollateral, setVerifyCollateral] = useState(false)
-                    let collateralAmount = 0
-                    if (!isLender)
-                        collateralAmount = btcMortgage.util.calcRequiredCollateral((loanAmount / floGlobals.btcRate), btcMortgage.policies[policyID]?.loan_collateral_ratio) || 0
-                    async function verifyCollateral(e) {
-                        const confirmation = await getConfirmation('Verify collateral?', { message: `You are about to check for ${formatAmount(collateralAmount)} as collateral. Continue?`, confirmText: 'Verify', cancelText: 'Cancel' })
-                        if (!confirmation)
-                            return;
-                        setVerifyCollateral(true)
-                        try {
-                            await btcMortgage.requestLoan(collateralRequestID, borrower)
-                            notify('Collateral verified successfully', 'success')
-                        } catch (err) {
-                            notify(err, 'error')
-                            setVerifyCollateral(false)
-                        }
-                    }
-                    const [lockingCollateral, setLockingCollateral] = useState(false)
-                    async function lockCollateral() {
-                        const confirmation = await getConfirmation('Lock collateral?', { message: `You are about to lock ${formatAmount(collateralAmount)} as collateral. Continue?`, confirmText: 'Lock', cancelText: 'Cancel' })
-                        if (!confirmation)
-                            return;
-                        try {
-                            setLockingCollateral(true)
-                            let collateralLockID = collateralLockRequestID
-                            if (!collateralLockID) {
-                                const { vectorClock } = await btcMortgage.requestCollateralLock(loanResponseID, coborrower, lender, await floDapps.user.private)
-                                collateralLockID = vectorClock
-                            }
-                            await btcMortgage.lockCollateral(collateralLockID, borrower, lender, await floDapps.user.private)
-                            notify('Collateral locked successfully', 'success')
-                            router.routeTo(location.hash)
-                        } catch (err) {
-                            notify(err, 'error')
-                            setLockingCollateral(false)
-                        }
-                    }
-                    async function requestCollateralLock() {
-                        btcMortgage.requestCollateralLock(loanResponseID, coborrower, lender, await floDapps.user.private).then(() => {
-                            notify('Collateral lock request sent successfully', 'success')
-                            router.routeTo(location.hash)
-                        }).catch(err => {
-                            notify(err, 'error')
-                        })
-                    }
-
-                    const [isIssuingLoan, setIsIssuingLoan] = useState(false)
-                    const [failSafe, setFailSafe] = useState(null)
-                    const [retringFailSafe, setRetryingFailSafe] = useState(false)
-                    async function issueLoan() {
-                        try {
-                            const confirmation = await getConfirmation('Issue loan?', { message: `You are about to issue ${formatAmount(loanAmount)} as loan. Continue?`, confirmText: 'Issue', cancelText: 'Cancel' })
+                if (type === 'loanOpening') {
+                    return Component(() => {
+                        const [verifyingCollateral, setVerifyCollateral] = useState(false)
+                        let collateralAmount = 0
+                        if (!isLender)
+                            collateralAmount = btcMortgage.util.calcRequiredCollateral((loanAmount / floGlobals.btcRate), btcMortgage.policies[policyID]?.loan_collateral_ratio) || 0
+                        async function verifyCollateral(e) {
+                            const confirmation = await getConfirmation('Verify collateral?', { message: `You are about to check for ${formatAmount(collateralAmount)} as collateral. Continue?`, confirmText: 'Verify', cancelText: 'Cancel' })
                             if (!confirmation)
                                 return;
-                            setIsIssuingLoan(true)
-                            await btcMortgage.sendLoanAmount(collateralLockAckID, borrower, coborrower, await floDapps.user.private)
-                            notify('Loan issued successfully', 'success')
-                        } catch (err) {
-                            notify(err.message || err, 'error')
-                            console.error(err)
-                            if (err.fail_safe)
-                                setFailSafe(err.fail_safe)
-                        } finally {
-                            setIsIssuingLoan(false)
-                        }
-                    }
-                    async function retryFailSafe() {
-                        try {
-                            setRetryingFailSafe(true)
-                            await btcOperator.retryFailSafe(failSafe, await floDapps.user.private)
-                            notify('Loan issued successfully', 'success')
-                        } catch (err) {
-                            notify(err, 'error')
-                        } finally {
-                            setRetryingFailSafe(false)
-                        }
-                    }
-                    // check if loan hasn't been issued even after 24 hours of collateral lock
-                    let hasLockedCollateralForMoreThan24Hours = false
-                    useEffect(() => {
-                        if (isCoborrower && hasLockedCollateral && !hasIssuedLoan) {
-                            const timeDiff = Date.now() - collateralLockAckTime
-                            if (timeDiff > 86400000) {
-                                hasLockedCollateralForMoreThan24Hours = true
+                            setVerifyCollateral(true)
+                            try {
+                                await btcMortgage.requestLoan(collateralRequestID, borrower)
+                                notify('Collateral verified successfully', 'success')
+                            } catch (err) {
+                                notify(err, 'error')
+                                setVerifyCollateral(false)
                             }
                         }
-                    }, [hasLockedCollateral, hasIssuedLoan])
-                    const [requestingCollateralRefund, setRequestingCollateralRefund] = useState(false)
-                    async function requestCollateralRefund() {
-                        const confirmation = await getConfirmation('Request collateral refund?', { message: `You are about to request for collateral refund. Continue?`, confirmText: 'Request', cancelText: 'Cancel' })
-                        if (!confirmation)
-                            return;
-                        try {
-                            setRequestingCollateralRefund(true)
-                            await btcMortgage.requestBanker.refundCollateral(collateralLockAckID, borrower, lender, await floDapps.user.private)
-                            notify('Collateral refund requested successfully', 'success')
-                        } catch (err) {
-                            notify(err, 'error')
-                        } finally {
-                            setRequestingCollateralRefund(false)
+                        const [lockingCollateral, setLockingCollateral] = useState(false)
+                        async function lockCollateral() {
+                            const confirmation = await getConfirmation('Lock collateral?', { message: `You are about to lock ${formatAmount(collateralAmount)} as collateral. Continue?`, confirmText: 'Lock', cancelText: 'Cancel' })
+                            if (!confirmation)
+                                return;
+                            try {
+                                setLockingCollateral(true)
+                                let collateralLockID = collateralLockRequestID
+                                if (!collateralLockID) {
+                                    const { vectorClock } = await btcMortgage.requestCollateralLock(loanResponseID, coborrower, lender, await floDapps.user.private)
+                                    collateralLockID = vectorClock
+                                }
+                                await btcMortgage.lockCollateral(collateralLockID, borrower, lender, await floDapps.user.private)
+                                notify('Collateral locked successfully', 'success')
+                                router.routeTo(location.hash)
+                            } catch (err) {
+                                notify(err, 'error')
+                                setLockingCollateral(false)
+                            }
                         }
-                    }
-                    function showLoanRequestDetails() {
-                        renderElem(getRef('request_details_content'), html`
-                            <div class="grid gap-0-3">
-                                <p>Loan amount</p>
-                                <b>${formatAmount(loanAmount, 'usd')}</b>
-                            </div>
-                            <div class="grid gap-0-3">
-                                <p>Collateral amount</p>
-                                <b>${formatAmount(collateralAmount)}</b>
-                            </div>
-                            <div class="grid gap-0-3">
-                                <p>Duration</p>
-                                <b>${btcMortgage.policies[policyID]?.duration}</b>
-                            </div>
-                            <div class="grid gap-0-3">
-                                <p>Interest</p>
-                                <b>${btcMortgage.policies[policyID]?.interest * 100}% p.a</b>
-                            </div>
-                            <div class="grid gap-0-3">
-                                <p>Borrower</p>
-                                <sm-copy value=${getBtcAddress(borrower)}>
-                                    <b>${getBtcAddress(borrower)}</b>
-                                </sm-copy>
-                            </div>
-                            ${!floCrypto.isSameAddr(borrower, coborrower) ? html`
+                        async function requestCollateralLock() {
+                            btcMortgage.requestCollateralLock(loanResponseID, coborrower, lender, await floDapps.user.private).then(() => {
+                                notify('Collateral lock request sent successfully', 'success')
+                                router.routeTo(location.hash)
+                            }).catch(err => {
+                                notify(err, 'error')
+                            })
+                        }
+
+                        const [isIssuingLoan, setIsIssuingLoan] = useState(false)
+                        const [failSafe, setFailSafe] = useState(null)
+                        const [retringFailSafe, setRetryingFailSafe] = useState(false)
+                        async function issueLoan() {
+                            try {
+                                const confirmation = await getConfirmation('Issue loan?', { message: `You are about to issue ${formatAmount(loanAmount)} as loan. Continue?`, confirmText: 'Issue', cancelText: 'Cancel' })
+                                if (!confirmation)
+                                    return;
+                                setIsIssuingLoan(true)
+                                await btcMortgage.sendLoanAmount(collateralLockAckID, borrower, coborrower, await floDapps.user.private)
+                                notify('Loan issued successfully', 'success')
+                            } catch (err) {
+                                notify(err.message || err, 'error')
+                                console.error(err)
+                                if (err.fail_safe)
+                                    setFailSafe(err.fail_safe)
+                            } finally {
+                                setIsIssuingLoan(false)
+                            }
+                        }
+                        async function retryFailSafe() {
+                            try {
+                                setRetryingFailSafe(true)
+                                await btcOperator.retryFailSafe(failSafe, await floDapps.user.private)
+                                notify('Loan issued successfully', 'success')
+                            } catch (err) {
+                                notify(err, 'error')
+                            } finally {
+                                setRetryingFailSafe(false)
+                            }
+                        }
+                        // check if loan hasn't been issued even after 24 hours of collateral lock
+                        let hasLockedCollateralForMoreThan24Hours = false
+                        useEffect(() => {
+                            if (isCoborrower && hasLockedCollateral && !hasIssuedLoan) {
+                                const timeDiff = Date.now() - collateralLockAckTime
+                                if (timeDiff > 86400000) {
+                                    hasLockedCollateralForMoreThan24Hours = true
+                                }
+                            }
+                        }, [hasLockedCollateral, hasIssuedLoan])
+                        const [requestingCollateralRefund, setRequestingCollateralRefund] = useState(false)
+                        async function requestCollateralRefund() {
+                            const confirmation = await getConfirmation('Request collateral refund?', { message: `You are about to request for collateral refund. Continue?`, confirmText: 'Request', cancelText: 'Cancel' })
+                            if (!confirmation)
+                                return;
+                            try {
+                                setRequestingCollateralRefund(true)
+                                await btcMortgage.requestBanker.refundCollateral(collateralLockAckID, borrower, lender, await floDapps.user.private)
+                                notify('Collateral refund requested successfully', 'success')
+                            } catch (err) {
+                                notify(err, 'error')
+                            } finally {
+                                setRequestingCollateralRefund(false)
+                            }
+                        }
+                        function showLoanRequestDetails() {
+                            renderElem(getRef('request_details_content'), html`
                                 <div class="grid gap-0-3">
-                                    <p>Collateral provider</p>
-                                    <sm-copy value=${getBtcAddress(coborrower)}>
-                                        <b>${getBtcAddress(coborrower)}</b>
+                                    <p>Loan amount</p>
+                                    <b>${formatAmount(loanAmount, 'usd')}</b>
+                                </div>
+                                <div class="grid gap-0-3">
+                                    <p>Collateral amount</p>
+                                    <b>${formatAmount(collateralAmount)}</b>
+                                </div>
+                                <div class="grid gap-0-3">
+                                    <p>Duration</p>
+                                    <b>${btcMortgage.policies[policyID]?.duration}</b>
+                                </div>
+                                <div class="grid gap-0-3">
+                                    <p>Interest</p>
+                                    <b>${btcMortgage.policies[policyID]?.interest * 100}% p.a</b>
+                                </div>
+                                <div class="grid gap-0-3">
+                                    <p>Borrower</p>
+                                    <sm-copy value=${getBtcAddress(borrower)}>
+                                        <b>${getBtcAddress(borrower)}</b>
                                     </sm-copy>
                                 </div>
-                            `: ''}
-                        `)
-                        openPopup('request_details_popup')
-                    }
-                    return html`
-                        <li class="loan-process">
-                            <div class="flex align-center gap-1 space-between">
-                                ${isBorrower ? html`
-                                    <h4 class="loan-process__type">Borrowing</h4>
-                                `: html`
-                                    ${isCoborrower ? html`
+                                ${!floCrypto.isSameAddr(borrower, coborrower) ? html`
+                                    <div class="grid gap-0-3">
+                                        <p>Collateral provider</p>
+                                        <sm-copy value=${getBtcAddress(coborrower)}>
+                                            <b>${getBtcAddress(coborrower)}</b>
+                                        </sm-copy>
+                                    </div>
+                                `: ''}
+                            `)
+                            openPopup('request_details_popup')
+                        }
+                        return html`
+                            <li class="loan-process">
+                                <div class="flex align-center gap-1 space-between">
+                                    ${isBorrower ? html`
+                                        <h4 class="loan-process__type">Borrowing</h4>
+                                    `: html`
+                                        ${isCoborrower ? html`
                                             <h4 class="loan-process__type">Co-borrowing</h4>
                                         `: html`
                                             <h4 class="loan-process__type">Lending</h4>
-                                        `
-                            }
-                                `}
-                                <button class="button button--colored button--small" onclick=${showLoanRequestDetails}>View details</button>
-                            </div>    
-                            <ul>
-                                ${!isLender ? html`                                
-                                    <li class=${`${hasProvidedCollateral ? 'done' : ''}`}>
+                                        `}
+                                    `}
+                                    <button class="button button--colored button--small" onclick=${showLoanRequestDetails}>View details</button>
+                                </div>    
+                                <ul>
+                                    ${!isLender ? html`                                
+                                        <li class=${`${hasProvidedCollateral ? 'done' : ''}`}>
+                                            <div class="progress">
+                                                <div class="circle"></div>
+                                                <div class="line"></div>
+                                            </div>
+                                            <div class="details">
+                                                <h4>Initiated loan request</h4>
+                                                ${hasProvidedCollateral ? html`
+                                                    <time>${getFormattedTime(initiationTime)}</time>
+                                                `: html`
+                                                    ${isCoborrower ? html`
+                                                    <p>Verify that you have <b>${formatAmount(collateralAmount)}</b> as collateral</p>
+                                                        <button class="button button--primary margin-right-auto" disabled=${verifyingCollateral} onclick=${verifyCollateral}>
+                                                            ${verifyingCollateral ? html`
+                                                                Verifying collateral
+                                                                <sm-spinner class="margin-left-0-5"></sm-spinner>
+                                                            `: html`
+                                                                Verify collateral
+                                                            `}
+                                                        </button>
+                                                    `: html`
+                                                        <p>Waiting for Co-Borrower to confirm collateral availability</p>
+                                                    `}
+                                                `}
+                                            </div>
+                                        </li>
+                                    `: ''}
+                                    <li class=${`${hasAgreedToLend ? 'done' : ''}`}>
                                         <div class="progress">
                                             <div class="circle"></div>
                                             <div class="line"></div>
                                         </div>
                                         <div class="details">
-                                            <h4>Initiated loan request</h4>
-                                            ${hasProvidedCollateral ? html`
-                                                <time>${getFormattedTime(initiationTime)}</time>
+                                            ${hasAgreedToLend ? html`
+                                                <h4>Started lending process</h4>
+                                                <time>${getFormattedTime(loanResponseTime)}</time>
                                             `: html`
-                                                ${isCoborrower ? html`
-                                                <p>Verify that you have <b>${formatAmount(collateralAmount)}</b> as collateral</p>
-                                                    <button class="button button--primary margin-right-auto" disabled=${verifyingCollateral} onclick=${verifyCollateral}>
-                                                        ${verifyingCollateral ? html`
-                                                            Verifying collateral
-                                                            <sm-spinner class="margin-left-0-5"></sm-spinner>
-                                                        `: html`
-                                                            Verify collateral
-                                                        `}
-                                                    </button>
+                                                <h4>Waiting for a lender</h4>
+                                                <p>Your loan request has been posted to the marketplace. Waiting for a lender to start lending process.</p>
+                                            `}
+                                        </div>
+                                    </li>
+                                    <li class=${`${hasLockedCollateral ? 'done' : ''}`}>
+                                        <div class="progress">
+                                            <div class="circle"></div>
+                                            <div class="line"></div>
+                                        </div>
+                                        <div class="details">
+                                            ${hasLockedCollateral ? html`
+                                                <h4>Collateral locked</h4>
+                                                ${hasLockedCollateralForMoreThan24Hours ? html`
+                                                    ${hasRequestedCollateralRefund ? html`
+                                                        <p>Collateral refund requested. It'll be refunded within 24 hrs.</p>
+                                                    `: html`
+                                                        <p>
+                                                            Loan has not been issued even after 24 hours of collateral lock.
+                                                            You can request for collateral refund. 
+                                                        </p>    
+                                                        <button class="button button--primary margin-right-auto" disabled=${requestCollateralRefund} onclick=${requestCollateralRefund}>
+                                                            ${requestingCollateralRefund ? html`
+                                                                Requesting collateral refund
+                                                                <sm-spinner class="margin-left-0-5"></sm-spinner>
+                                                            `: html`
+                                                                Request collateral refund
+                                                            `}
+                                                        </button>
+                                                    `}
                                                 `: html`
-                                                    <p>Waiting for Co-Borrower to confirm collateral availability</p>
+                                                    <time>${getFormattedTime(collateralLockAckTime)}</time>
+                                                `}
+                                            `: html`
+                                                <h4>Waiting for collateral to be locked</h4>
+                                                <p>${isCoborrower ? 'You need' : 'Loan co-borrower needs'} to lock collateral before loan can be issued.</p>
+                                                ${hasAgreedToLend && (isBorrower || isCoborrower) ? html`
+                                                    ${floCrypto.isSameAddr(borrower, coborrower) ? html`
+                                                        <button class="button button--primary margin-right-auto" disabled=${lockingCollateral} onclick=${lockCollateral}>
+                                                            ${lockingCollateral ? html`
+                                                                Locking collateral
+                                                                <sm-spinner class="margin-left-0-5"></sm-spinner>
+                                                            `: html`
+                                                                Lock collateral
+                                                            `}
+                                                        </button>
+                                                    `: html`
+                                                        <button class="button button--primary margin-right-auto" onclick=${requestCollateralLock}>Request collateral lock</button>    
+                                                    `}
+                                                `: ''}
+                                            `}
+                                        </div>
+                                    </li>
+                                    <li class=${`${hasIssuedLoan ? 'done' : ''}`}>
+                                        <div class="progress">
+                                            <div class="circle"></div>
+                                        </div>
+                                        <div class="details">
+                                            ${hasIssuedLoan ? html`
+                                                <h4>Loan issued</h4>
+                                                <time>${getFormattedTime(loanIssuedTime)}</time>
+                                            `: html`
+                                                ${hasLockedCollateral && isLender ? html`
+                                                    ${failSafe ? html`
+                                                        <h4>Loan failed to issue</h4>
+                                                        <button class="button button--primary margin-right-auto" disabled=${retringFailSafe} onclick=${retryFailSafe}>
+                                                            ${retringFailSafe ? html`
+                                                                Retrying
+                                                                <sm-spinner class="margin-left-0-5"></sm-spinner>
+                                                            `: html`
+                                                                Retry
+                                                            `}
+                                                        </button>
+                                                    `: html`
+                                                        <h4>Loan is ready to be issued</h4>
+                                                        <button class="button button--primary margin-right-auto" disabled=${isIssuingLoan} onclick=${issueLoan}>
+                                                            ${isIssuingLoan ? html`
+                                                                Issuing loan
+                                                                <sm-spinner class="margin-left-0-5"></sm-spinner>
+                                                            `: html`
+                                                                Issue loan
+                                                            `}
+                                                        </button>
+                                                    `}
+                                                `: html`
+                                                    <h4>Waiting for loan to be issued</h4>
                                                 `}
                                             `}
                                         </div>
                                     </li>
-                                `: ''}
-                                <li class=${`${hasAgreedToLend ? 'done' : ''}`}>
-                                    <div class="progress">
-                                        <div class="circle"></div>
-                                        <div class="line"></div>
-                                    </div>
-                                    <div class="details">
-                                        ${hasAgreedToLend ? html`
-                                            <h4>Started lending process</h4>
-                                            <time>${getFormattedTime(loanResponseTime)}</time>
-                                        `: html`
-                                            <h4>Waiting for a lender</h4>
-                                            <p>Your loan request has been posted to the marketplace. Waiting for a lender to start lending process.</p>
-                                        `}
-                                    </div>
-                                </li>
-                                <li class=${`${hasLockedCollateral ? 'done' : ''}`}>
-                                    <div class="progress">
-                                        <div class="circle"></div>
-                                        <div class="line"></div>
-                                    </div>
-                                    <div class="details">
-                                        ${hasLockedCollateral ? html`
-                                            <h4>Collateral locked</h4>
-                                            ${hasLockedCollateralForMoreThan24Hours ? html`
-                                                ${hasRequestedCollateralRefund ? html`
-                                                    <p>Collateral refund requested. It'll be refunded within 24 hrs.</p>
-                                                `: html`
-                                                    <p>
-                                                        Loan has not been issued even after 24 hours of collateral lock.
-                                                        You can request for collateral refund. 
-                                                    </p>    
-                                                    <button class="button button--primary margin-right-auto" disabled=${requestCollateralRefund} onclick=${requestCollateralRefund}>
-                                                        ${requestingCollateralRefund ? html`
+                                </ul>
+                                <p class="margin-left-auto">Request ID: #${loanOpeningProcessID}</p>
+                            </li>
+                        `
+                    })()
+                } else if (type === 'loanClosing') {
+                    return Component(() => {
+                        const [isRequestingCollateral, setIsRequestingCollateral] = useState(false)
+                        let failedToUnlockCollateralAfter24Hours = false
+                        if (isCoborrower && hasRequestedCollateralLock && !hasRefundedCollateral) {
+                            const timeDiff = Date.now() - collateralLockAckTime
+                            if (timeDiff > 86400000) {
+                                failedToUnlockCollateralAfter24Hours = true
+                            }
+                        }
+                        async function requestCollateralUnlock() {
+                            const confirmation = await getConfirmation('Request collateral refund?', { message: `You are about to request for collateral refund. Continue?`, confirmText: 'Request', cancelText: 'Cancel' })
+                            if (!confirmation)
+                                return;
+                            setIsRequestingCollateral(true)
+                            try {
+                                await btcMortgage.requestUnlockCollateral(loanID, closingTxID, await floDapps.user.private, failedToUnlockCollateralAfter24Hours)
+                                notify('Collateral refund requested successfully', 'success')
+                            } catch (err) {
+                                notify(err, 'error')
+                            } finally {
+                                setIsRequestingCollateral(false)
+                            }
+                        }
+                        return html`
+                            <li class="loan-process">
+                                ${isBorrower || coborrower ? html`
+                                    <h4 class="loan-process__type">Repaying loan</h4>
+                                `: html`
+                                    <h4 class="loan-process__type">Borrower repaying</h4>
+                                `}
+                                <ul>
+                                    <li class="done">
+                                        <div class="progress">
+                                            <div class="circle"></div>
+                                            <div class="line"></div>
+                                        </div>
+                                        <div class="details">
+                                            <h4>Due amount paid</h4>
+                                            <time>${getFormattedTime(loanClosedAckTime)}</time>
+                                        </div>
+                                    </li>
+                                    <li class=${hasRequestedCollateralUnlock ? 'done' : ''}>
+                                        <div class="progress">
+                                            <div class="circle"></div>
+                                            <div class="line"></div>
+                                        </div>
+                                        <div class="details">
+                                            ${hasRequestedCollateralLock ? html`
+                                                ${failedToUnlockCollateralAfter24Hours ? html`
+                                                    <h4>Lender hasn't unlocked collateral</h4>
+                                                    <p>Collateral failed to unlock even after 24 hours of loan closing. Please request to banker below.</p>
+                                                    <button class="button button--primary margin-right-auto" disabled=${isRequestingCollateral} onclick=${requestCollateralUnlock}>
+                                                        ${isRequestingCollateral ? html`
                                                             Requesting collateral refund
                                                             <sm-spinner class="margin-left-0-5"></sm-spinner>
                                                         `: html`
                                                             Request collateral refund
                                                         `}
                                                     </button>
+                                                `: html`
+                                                    <h4>Collateral unlock requested</h4>
+                                                    <time>${getFormattedTime(unlockCollateralRequestTime)}</time>
                                                 `}
                                             `: html`
-                                                <time>${getFormattedTime(collateralLockAckTime)}</time>
+                                                ${isCoborrower ? html`
+                                                    <h4>Request collateral refund</h4>
+                                                    <button class="button button--primary margin-right-auto" disabled=${isRequestingCollateral} onclick=${requestCollateralUnlock}>
+                                                        ${isRequestingCollateral ? html`
+                                                            Requesting collateral refund
+                                                            <sm-spinner class="margin-left-0-5"></sm-spinner>
+                                                        `: html`
+                                                            Request collateral refund
+                                                        `}
+                                                    </button>    
+                                                `: html`
+                                                    <h4>Waiting for Co-borrower to request collateral refund</h4>
+                                                    <p>Collateral refund can be requested only by Co-borrower</p>
+                                                `}
                                             `}
-                                        `: html`
-                                            <h4>Waiting for collateral to be locked</h4>
-                                            <p>${isCoborrower ? 'You need' : 'Loan co-borrower needs'} to lock collateral before loan can be issued.</p>
-                                            ${hasAgreedToLend && (isBorrower || isCoborrower) ? html`
-                                                ${floCrypto.isSameAddr(borrower, coborrower) ? html`
-                                                    <button class="button button--primary margin-right-auto" disabled=${lockingCollateral} onclick=${lockCollateral}>
-                                                        ${lockingCollateral ? html`
-                                                            Locking collateral
-                                                            <sm-spinner class="margin-left-0-5"></sm-spinner>
-                                                        `: html`
-                                                            Lock collateral
-                                                        `}
-                                                    </button>
-                                                `: html`
-                                                    <button class="button button--primary margin-right-auto" onclick=${requestCollateralLock}>Request collateral lock</button>    
-                                                `}
-                                            `: ''}
-                                        `}
-                                    </div>
-                                </li>
-                                <li class=${`${hasIssuedLoan ? 'done' : ''}`}>
-                                    <div class="progress">
-                                        <div class="circle"></div>
-                                    </div>
-                                    <div class="details">
-                                        ${hasIssuedLoan ? html`
-                                            <h4>Loan issued</h4>
-                                            <time>${getFormattedTime(loanIssuedTime)}</time>
-                                        `: html`
-                                            ${hasLockedCollateral && isLender ? html`
-                                                ${failSafe ? html`
-                                                    <h4>Loan failed to issue</h4>
-                                                    <button class="button button--primary margin-right-auto" disabled=${retringFailSafe} onclick=${retryFailSafe}>
-                                                        ${retringFailSafe ? html`
-                                                            Retrying
-                                                            <sm-spinner class="margin-left-0-5"></sm-spinner>
-                                                        `: html`
-                                                            Retry
-                                                        `}
-                                                    </button>
-                                                `: html`
-                                                    <h4>Loan is ready to be issued</h4>
-                                                    <button class="button button--primary margin-right-auto" disabled=${isIssuingLoan} onclick=${issueLoan}>
-                                                        ${isIssuingLoan ? html`
-                                                            Issuing loan
-                                                            <sm-spinner class="margin-left-0-5"></sm-spinner>
-                                                        `: html`
-                                                            Issue loan
-                                                        `}
-                                                    </button>
-                                                `}
+                                        </div>
+                                    </li>
+                                    <li class=${hasRefundedCollateral ? 'done' : ''}>
+                                        <div class="progress">
+                                            <div class="circle"></div>
+                                        </div>
+                                        <div class="details">
+                                            ${hasRefundedCollateral ? html`
+                                                <h4>Collateral refunded. Loan closed.</h4>
+                                                <time>${getFormattedTime(unlockCollateralAckTime)}</time>
                                             `: html`
-                                                <h4>Waiting for loan to be issued</h4>
+                                                <h4>Waiting for collateral to be refunded</h4>
+                                                <p>Collateral will be refunded within 24 hours of request.</p>
                                             `}
-                                        `}
-                                    </div>
-                                </li>
-                            </ul>
-                            <p class="margin-left-auto">Request ID: #${loanOpeningProcessID}</p>
-                        </li>
-                    `
-                })()
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                        `
+                    })()
+                } else {
+                    console.log('Unknown loan process type', type)
+                    return html``
+                }
             },
             loan(loanID) {
                 const {
@@ -949,20 +1055,26 @@
                 const amountDue = btcMortgage.util.calcDueAmount(loan_amount, policy_id, open_time)
                 const [isRepayingLoan, setIsRepayingLoan] = useState(false)
                 async function initLoanRepayment() {
-                    const confirmation = await getConfirmation('Repay loan?', { message: `You are about to repay ${formatAmount(amountDue)} as loan. Continue?`, confirmText: 'Repay', cancelText: 'Cancel' })
+                    const confirmation = await getConfirmation('Repay loan?', { message: `You are about to repay ${formatAmount(amountDue, 'usd')} as loan. Continue?`, confirmText: 'Repay', cancelText: 'Cancel' })
                     if (!confirmation)
                         return;
                     setIsRepayingLoan(true)
                     try {
-                        await btcMortgage.repayLoan(loan_id, await floDapps.user.private)
+                        const { message: { closing_txid } } = await btcMortgage.repayLoan(loan_id, await floDapps.user.private)
                         notify('Loan repaid successfully', 'success')
+                        if (isCoborrower) {
+                            await btcMortgage.requestUnlockCollateral(loan_id, closing_txid, await floDapps.user.private)
+                            notify('Collateral refund requested', 'success')
+                        }
                     } catch (err) {
                         notify(err, 'error')
                     } finally {
                         setIsRepayingLoan(false)
                     }
                 }
-
+                const isBorrower = floCrypto.isSameAddr(borrower, floDapps.user.id)
+                const isCoborrower = floCrypto.isSameAddr(coborrower, floDapps.user.id)
+                const isLender = floCrypto.isSameAddr(lender, floDapps.user.id)
                 return html`
                     <li class="loan">
                         <sm-copy value=${loan_id} clip-text>
@@ -990,6 +1102,10 @@
                                 <b>${getFormattedTime(open_time)}</b>
                             </div>
                         </div>
+                        <div class="grid gap-0-3">
+                            <p>Interest ${isLender ? 'earned' : 'accrued'}</p>
+                            <b style=${`color: ${isLender ? 'var(--green)' : 'var(--danger-color)'}`}>${formatAmount(amountDue - loan_amount, 'usd')}</b>
+                        </div>
                         <details>
                             <summary>
                                 Borrower details
@@ -1298,14 +1414,14 @@
             } else {
                 // user homepage
                 const inbox = Component(() => {
-                    const [inProcessLoanOpeningRequests, inProcessLoanClosingRequests] = groupLoanProcess()
+                    const loansInProcess = groupLoanProcess()
                     const { borrowed, coBorrowed, lent } = groupLoans()
                     const [view, setView] = useState(section)
                     let loanRequests = [];
                     for (const key in floGlobals.loanRequests) {
                         const { message: { borrower, coborrower, loan_opening_process_id } } = floGlobals.loanRequests[key]
                         if (!loan_opening_process_id) continue // TODO: remove this check after all requests are updated
-                        if (floGlobals.inProcessLoanOpeningRequests.has(loan_opening_process_id)) continue // if loan request is in process, don't show loan request
+                        if (floGlobals.loansInProcess.has(loan_opening_process_id)) continue // if loan request is in process, don't show loan request
                         loanRequests.push(key)
                     }
                     function handleChange(e) {
@@ -1326,7 +1442,7 @@
                             <sm-chips onchange=${handleChange}>
                                 <sm-chip value="in-process" selected=${view === 'in-process'}>
                                     In process
-                                    ${inProcessLoanOpeningRequests.length ? html`<span class="badge">${inProcessLoanOpeningRequests.length}</span>` : ''}
+                                    ${loansInProcess.length ? html`<span class="badge">${loansInProcess.length}</span>` : ''}
                                 </sm-chip>
                                 <sm-chip value="my-loans" selected=${view === 'my-loans'}>
                                     My loans
@@ -1369,9 +1485,9 @@
                                     `}
                                 `: ''}
                                 ${view === 'in-process' ? html`
-                                    ${inProcessLoanOpeningRequests.length ? html`
+                                    ${loansInProcess.length ? html`
                                         <ul class="grid gap-1">
-                                            ${inProcessLoanOpeningRequests.map(loan => render.loanProcess(loan))}
+                                            ${loansInProcess.map(loan => render.loanProcess(loan))}
                                         </ul> 
                                         <a href="#/apply-loan" class="button button--primary margin-right-auto">Apply for a new loan</a>
                                     `: html`
@@ -1440,7 +1556,6 @@
                 ...floGlobals.myOutbox
             }
             const loansInProcess = {}
-            const loanClosingInProcess = {}
             for (const key in allMessages) {
                 const {
                     message: {
@@ -1459,6 +1574,7 @@
                             hasProvidedCollateral: false,
                             hasAgreedToLend: false,
                             hasLockedCollateral: false,
+                            type: 'loanOpening'
                         }
                     }
                     if (borrower) {
@@ -1518,42 +1634,50 @@
                             break;
                     }
                 } else if (closing_txid) {
-                    if (!loanClosingInProcess[closing_txid])
-                        loanClosingInProcess[closing_txid] = {
+                    if (!loansInProcess[closing_txid])
+                        loansInProcess[closing_txid] = {
                             closingTxID: closing_txid,
                             hasRequestedCollateralRefund: false,
                             hasRefundedCollateral: false,
                             hasPaidLoan: false,
+                            type: 'loanClosing'
                         }
-
+                    const { borrower, coborrower, lender } = btcMortgage.loans[loan_id]
+                    if (borrower) {
+                        loansInProcess[closing_txid].borrower = borrower
+                        loansInProcess[closing_txid].isBorrower = floCrypto.isSameAddr(borrower, floDapps.user.id)
+                    }
+                    if (coborrower) {
+                        loansInProcess[closing_txid].coborrower = coborrower
+                        loansInProcess[closing_txid].isCoborrower = floCrypto.isSameAddr(coborrower, floDapps.user.id)
+                    }
+                    if (lender) {
+                        loansInProcess[closing_txid].lender = lender
+                        loansInProcess[closing_txid].isLender = floCrypto.isSameAddr(lender, floDapps.user.id)
+                    }
                     switch (type) {
                         case 'type_loan_closed_ack':
-                            loanClosingInProcess[closing_txid].loanClosedAckTime = time
-                            loanClosingInProcess[closing_txid].loanClosedAckID = key
-                            loanClosingInProcess[closing_txid].hasPaidLoan = true
+                            loansInProcess[closing_txid].loanClosedAckTime = time
+                            loansInProcess[closing_txid].loanClosedAckID = key
+                            loansInProcess[closing_txid].hasPaidLoan = true
                             break;
                         case 'type_unlock_collateral_request':
-                            loanClosingInProcess[closing_txid].unlockCollateralRequestTime = time
-                            loanClosingInProcess[closing_txid].unlockCollateralRequestID = key
-                            loanClosingInProcess[closing_txid].hasRequestedCollateralUnlock = true
+                            loansInProcess[closing_txid].unlockCollateralRequestTime = time
+                            loansInProcess[closing_txid].unlockCollateralRequestID = key
+                            loansInProcess[closing_txid].hasRequestedCollateralUnlock = true
                             break;
                         case 'type_unlock_collateral_ack':
-                            loanClosingInProcess[closing_txid].unlockCollateralAckTime = time
-                            loanClosingInProcess[closing_txid].unlockCollateralAckID = key
-                            loanClosingInProcess[closing_txid].hasRefundedCollateral = true
+                            loansInProcess[closing_txid].unlockCollateralAckTime = time
+                            loansInProcess[closing_txid].unlockCollateralAckID = key
+                            loansInProcess[closing_txid].hasRefundedCollateral = true
                             break;
                     }
                 }
             }
             // sort by time
-            return [
-                Object.values(loansInProcess).sort((a, b) => {
-                    return (b.initiationTime || b.loanResponseTime) - (a.initiationTime || a.loanResponseTime)
-                }),
-                Object.values(loanClosingInProcess).sort((a, b) => {
-                    return b.loanClosedAckTime - a.loanClosedAckTime
-                })
-            ]
+            return Object.values(loansInProcess).sort((a, b) => {
+                return (b.initiationTime || b.loanResponseTime || b.loanClosedAckTime) - (a.initiationTime || a.loanResponseTime || a.loanClosedAckTime)
+            })
             // .reduce((acc, loan) => { // group by borrower, coborrower and lender
             //     if (loan.isBorrower)
             //         acc.borrowing.push(loan)
@@ -1804,11 +1928,11 @@
             }).catch(error => console.error(error))
         }
         function parseInProcessRequests(requests) {
-            if (!floGlobals.inProcessLoanOpeningRequests)
-                floGlobals.inProcessLoanOpeningRequests = new Set()
+            if (!floGlobals.loansInProcess)
+                floGlobals.loansInProcess = new Set()
             for (const key in requests) {
                 const { message: { loan_opening_process_id } } = requests[key]
-                floGlobals.inProcessLoanOpeningRequests.add(loan_opening_process_id)
+                floGlobals.loansInProcess.add(loan_opening_process_id)
             }
         }
         function getAllInvolvedAddresses() { // get all addresses involved in loan process (except my address)