Adding models and minor changes to view