Refactored view models to make them a bit more succient
Simple changes to webapp display