Scope styles within CSS, Common CSS moved to common file, removed dead code, and slight reordering for ease of reading
