fix layout with helper to remove repetition