Reorganized css, added mixing