Better spacing variables and new padding variables