Working on consolidating screens