UI Improvement to the punches screen