More work around the edge of the user screen

Trying to get updates to fire