#349 Better refresh layout