Better structure of fixtures, minor styling improvements, better naming