Added more nested selectors and variables.

Added more variables and nested selectors. Also fixed some layout
parameters to match better.