Fix bugs with nesting, cleanup unused CSS