widening gap edit & another screen restructure