Fixed sticky rect layout computation
State saving/loading

Minor cleanup