Feature/refine ui and fix