Refactoring

Minor view modifications