checkpoint before modularizing UI