Starting to improve css