organized and updated screens