[#38] Direct controller_name insertion in layout was replaced by helper method