move helpers into their own files
use new helpers in layouts