Minor CSS validaiton changes and code cleanup