View refactoring, fixed markup bug, __unicode__ functions for models
View refactoring, fixed markup bug, __unicode__ functions for models