Styling changes, added sorting to many models, refactored code