cleaning up css rules and properly namespacing for clarity