Starting to split css in correct files plus couple of fixes