Clean UI + Add loader