FAIMS-244 - fix the ui and add back button