Better css/less structure