LAI-18 code review - backend and ui clean-up