UI Changes to accommodate DTOs