refactored kibana