Fix for variables and helpers in application layout