css namespaces and minor code cleanup