move things to work with templates/layouts