Changes to models and first index view