Refactored UI page