Design fixes for attributes functionality
Fixtures for attributes added