Move view layout variables from controllers to view & minor fixed