Standardizing layout, adding missing variables