Reset from server and reset from client with proper handling of layout
and visibility