Logi page refactor